The Unified and Autonomous Development Platform
fix issue #32: Post-build action to close milestone
Robin Shena8e17d5a491d
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.javanew file mode 100644index 0000000000..58451d15ca--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CloseMilestoneAction.java@@ -0,0 +1,75 @@+package io.onedev.server.buildspec.job.action;++import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.buildspec.job.Job;+import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.model.Build;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;++@Editable(name="Close milestone", order=500)+public class CloseMilestoneAction extends PostBuildAction {++ private static final long serialVersionUID = 1L;++ private String milestoneName;++ @Editable(order=1000, description="Specify name of the milestone. "+ + "<b>Note:</b> Type <tt>@</tt> to <a href='https://code.onedev.io/projects/onedev-manual/blob/master/pages/variable-substitution.md' target='_blank' tabindex='-1'>insert variable</a>, use <tt>\\</tt> to escape normal occurrences of <tt>@</tt> or <tt>\\</tt>")+ @Interpolative(variableSuggester="suggestVariables")+ @NotEmpty+ public String getMilestoneName() {+ return milestoneName;+ }++ public void setMilestoneName(String milestoneName) {+ this.milestoneName = milestoneName;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestVariables(String matchWith) {+ return Job.suggestVariables(matchWith);+ }++ @Override+ public void execute(Build build) {+ OneDev.getInstance(TransactionManager.class).run(new Runnable() {++ @Override+ public void run() {+ Project project = build.getProject();+ String milestoneName = getMilestoneName();+ MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);+ Milestone milestone = milestoneManager.find(project, milestoneName);+ if (milestone != null) {+ CloseMilestoneAction instance = new CloseMilestoneAction();+ instance.setMilestoneName(getMilestoneName());+ if (project.getBuildSetting().isActionAuthorized(build, instance)) {+ milestone.setClosed(true);+ milestoneManager.save(milestone);+ } else {+ throw new OneException("Closing milestone '" + milestoneName + "' is not allowed in this build");+ }+ } else {+ throw new OneException("Unable to find milestone '" + milestoneName + "'");+ }+ }++ });+ }++ @Override+ public String getDescription() {+ return "Close milestone";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.javaindex f31c945bec..450ec12f68 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateTagAction.java@@ -14,7 +14,6 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.model.support.TagProtection;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;import io.onedev.server.web.editable.annotation.Multiline;@@ -62,19 +61,19 @@ public class CreateTagAction extends PostBuildAction {PersonIdent tagIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();Project project = build.getProject();String tagName = getTagName();- Ref tagRef = project.getTagRef(tagName);- TagProtection protection = project.getTagProtection(tagName, build);- if (tagRef != null) {- if (protection.isPreventUpdate()) {- throw new OneException("Updating tag '" + tagName + "' is not allowed in this build");- } else {++ CreateTagAction instance = new CreateTagAction();+ instance.setTagName(tagName);+ if (project.getBuildSetting().isActionAuthorized(build, instance)) {+ Ref tagRef = project.getTagRef(tagName);+ if (tagRef != null) {OneDev.getInstance(ProjectManager.class).deleteTag(project, tagName);project.createTag(tagName, build.getCommitHash(), tagIdent, getTagMessage());+ } else {+ project.createTag(tagName, build.getCommitHash(), tagIdent, getTagMessage());}- } else if (protection.isPreventCreation()) {- throw new OneException("Creating tag '" + tagName + "' is not allowed in this build");} else {- project.createTag(tagName, build.getCommitHash(), tagIdent, getTagMessage());+ throw new OneException("Creating tag '" + tagName + "' is not allowed in this build");}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 7a73b33f1d..9cee71d887 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -62,7 +62,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.Role;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;-import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.model.support.build.BuildPreservation;import io.onedev.server.model.support.role.JobPrivilege;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 9b8e922460..d1e0718f91 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -1429,7 +1429,44 @@ public class DataMigrator {private void migrate35(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Settings.xml")) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element buildSettingElement = element.element("buildSetting");+ for (Element queryElement: buildSettingElement.element("namedQueries").elements())+ queryElement.setName("io.onedev.server.model.support.build.NamedBuildQuery");+ Element secretsElement = buildSettingElement.element("secrets");+ secretsElement.setName("jobSecrets");+ for (Element secretElement: secretsElement.elements())+ secretElement.setName("io.onedev.server.model.support.build.JobSecret");+ for (Element buildPreservationElement: buildSettingElement.element("buildPreservations").elements())+ buildPreservationElement.setName("io.onedev.server.model.support.build.BuildPreservation");+ buildSettingElement.addElement("actionAuthorizations");+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Users.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ for (Element queryElement: element.element("userBuildQueries").elements())+ queryElement.setName("io.onedev.server.model.support.build.NamedBuildQuery");+ Element buildSettingElement = element.element("buildSetting");+ Element secretsElement = buildSettingElement.element("secrets");+ secretsElement.setName("jobSecrets");+ for (Element secretElement: secretsElement.elements())+ secretElement.setName("io.onedev.server.model.support.build.JobSecret");+ for (Element buildPreservationElement: buildSettingElement.element("buildPreservations").elements())+ buildPreservationElement.setName("io.onedev.server.model.support.build.BuildPreservation");+ buildSettingElement.addElement("actionAuthorizations");+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("BuildQuerySettings.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ for (Element queryElement: element.element("userQueries").elements())+ queryElement.setName("io.onedev.server.model.support.build.NamedBuildQuery");+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Settings.xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {if (element.elementTextTrim("key").equals("ISSUE")) {@@ -1439,6 +1476,12 @@ public class DataMigrator {stateElement.element("done").detach();}}+ } else if (element.elementTextTrim("key").equals("BUILD")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (Element queryElement: valueElement.element("namedQueries").elements())+ queryElement.setName("io.onedev.server.model.support.build.NamedBuildQuery");+ }}}dom.writeToFile(file, false);diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 924726ef60..5cd6d82998 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -57,7 +57,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.infomanager.CommitInfoManager;-import io.onedev.server.model.support.JobSecret;+import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.BeanUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.javaindex 21530a22ee..7d78ee2612 100644--- a/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java@@ -13,8 +13,8 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex b9832e19fd..a2e5c16d45 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -97,9 +97,9 @@ import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedCommitQuery;-import io.onedev.server.model.support.ProjectBuildSetting;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.WebHook;+import io.onedev.server.model.support.build.ProjectBuildSetting;import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;import io.onedev.server.persistence.SessionManager;@@ -1160,29 +1160,6 @@ public class Project extends AbstractEntity {return protection;}- public TagProtection getTagProtection(String tagName, Build build) {- boolean noCreation = false;- boolean noDeletion = false;- boolean noUpdate = false;- Project project = build.getProject();- for (TagProtection protection: getTagProtections()) {- if (protection.isEnabled()- && (protection.getBuildBranches() == null || project.isCommitOnBranches(build.getCommitId(), protection.getBuildBranches()))- && PatternSet.parse(protection.getTags()).matches(new PathMatcher(), tagName)) {- noCreation = noCreation || protection.isPreventCreation();- noDeletion = noDeletion || protection.isPreventDeletion();- noUpdate = noUpdate || protection.isPreventUpdate();- }- }-- TagProtection protection = new TagProtection();- protection.setPreventCreation(noCreation);- protection.setPreventDeletion(noDeletion);- protection.setPreventUpdate(noUpdate);-- return protection;- }-public BranchProtection getBranchProtection(String branchName, @Nullable User user) {boolean noCreation = false;boolean noDeletion = false;diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex e0ac0c4dc0..ea75c5605b 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -29,11 +29,11 @@ import org.hibernate.validator.constraints.NotEmpty;import com.fasterxml.jackson.annotation.JsonView;import com.google.common.base.MoreObjects;-import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.model.support.UserBuildSetting;import io.onedev.server.model.support.WebHook;+import io.onedev.server.model.support.build.NamedBuildQuery;+import io.onedev.server.model.support.build.UserBuildSetting;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.util.SecurityUtils;diff --git a/server-core/src/main/java/io/onedev/server/model/support/CommitMessageTransform.java b/server-core/src/main/java/io/onedev/server/model/support/CommitMessageTransform.javadeleted file mode 100644index 7bd95cbb9d..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/CommitMessageTransform.java+++ /dev/null@@ -1,40 +0,0 @@-package io.onedev.server.model.support;--import java.io.Serializable;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.util.validation.annotation.JavaPattern;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class CommitMessageTransform implements Serializable {-- private static final long serialVersionUID = 1L;-- private String searchFor;-- private String replaceWith;-- @Editable(order=100)- @NotEmpty- @JavaPattern- public String getSearchFor() {- return searchFor;- }-- public void setSearchFor(String searchFor) {- this.searchFor = searchFor;- }-- @Editable(order=200)- @NotEmpty- public String getReplaceWith() {- return replaceWith;- }-- public void setReplaceWith(String replaceWith) {- this.replaceWith = replaceWith;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex aca9518a8a..9867ad5084 100644--- a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -14,7 +14,6 @@ import io.onedev.server.util.usermatch.Anyone;import io.onedev.server.util.usermatch.UserMatch;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.util.SuggestionUtils;@@ -30,8 +29,6 @@ public class TagProtection implements Serializable {private String userMatch = new Anyone().toString();- private String buildBranches;-private boolean preventUpdate = true;private boolean preventDeletion = true;@@ -73,20 +70,6 @@ public class TagProtection implements Serializable {this.userMatch = userMatch;}- @Editable(order=180, description=""- + "Rule will apply if build operating the tag is on specified branches. Multiple branches "- + "should be separated with spaces. Use * or ? for wildcard match. Leave empty to match "- + "all branches")- @Patterns(suggester = "suggestBranches")- @NameOfEmptyValue("All")- public String getBuildBranches() {- return buildBranches;- }-- public void setBuildBranches(String buildBranches) {- this.buildBranches = buildBranches;- }-@SuppressWarnings("unused")private static List<InputSuggestion> suggestBranches(String matchWith) {Project project = Project.get();diff --git a/server-core/src/main/java/io/onedev/server/model/support/UserBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/UserBuildSetting.javadeleted file mode 100644index 0c3c7aed57..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/UserBuildSetting.java+++ /dev/null@@ -1,34 +0,0 @@-package io.onedev.server.model.support;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class UserBuildSetting implements Serializable {-- private static final long serialVersionUID = 1L;-- private List<JobSecret> secrets = new ArrayList<>();-- private List<BuildPreservation> buildPreservations = new ArrayList<>();-- public List<JobSecret> getSecrets() {- return secrets;- }-- public void setSecrets(List<JobSecret> secrets) {- this.secrets = secrets;- }-- public List<BuildPreservation> getBuildPreservations() {- return buildPreservations;- }-- public void setBuildPreservations(List<BuildPreservation> buildPreservations) {- this.buildPreservations = buildPreservations;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.javaindex 0292c63719..0ccf185334 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java@@ -6,7 +6,7 @@ import java.util.List;import javax.annotation.Nullable;-import io.onedev.server.model.support.NamedBuildQuery;+import io.onedev.server.model.support.build.NamedBuildQuery;public class GlobalBuildSetting implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/model/support/BuildPreservation.java b/server-core/src/main/java/io/onedev/server/model/support/build/BuildPreservation.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/model/support/BuildPreservation.javarename to server-core/src/main/java/io/onedev/server/model/support/build/BuildPreservation.javaindex d34adb562c..c131ed5eee 100644--- a/server-core/src/main/java/io/onedev/server/model/support/BuildPreservation.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/BuildPreservation.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support;+package io.onedev.server.model.support.build;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/model/support/JobSecret.javarename to server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javaindex 767435ed60..048a8444f3 100644--- a/server-core/src/main/java/io/onedev/server/model/support/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support;+package io.onedev.server.model.support.build;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.javarename to server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.javaindex 0917253ca6..ca29939995 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java@@ -1,7 +1,8 @@-package io.onedev.server.model.support;+package io.onedev.server.model.support.build;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.model.support.NamedQuery;import io.onedev.server.web.editable.annotation.BuildQuery;import io.onedev.server.web.editable.annotation.Editable;diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.javasimilarity index 66%rename from server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.javarename to server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.javaindex de36e80d24..1b7a924821 100644--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support;+package io.onedev.server.model.support.build;import java.io.Serializable;import java.util.ArrayList;@@ -13,9 +13,12 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;import io.onedev.server.OneException;+import io.onedev.server.buildspec.job.action.PostBuildAction;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalBuildSetting;+import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -27,18 +30,20 @@ public class ProjectBuildSetting implements Serializable {private List<NamedBuildQuery> namedQueries;- private List<JobSecret> secrets = new ArrayList<>();+ private List<JobSecret> jobSecrets = new ArrayList<>();private List<BuildPreservation> buildPreservations = new ArrayList<>();+ private List<ActionAuthorization> actionAuthorizations = new ArrayList<>();+private transient GlobalBuildSetting globalSetting;- public List<JobSecret> getSecrets() {- return secrets;+ public List<JobSecret> getJobSecrets() {+ return jobSecrets;}- public void setSecrets(List<JobSecret> secrets) {- this.secrets = secrets;+ public void setJobSecrets(List<JobSecret> jobSecrets) {+ this.jobSecrets = jobSecrets;}public List<BuildPreservation> getBuildPreservations() {@@ -49,6 +54,14 @@ public class ProjectBuildSetting implements Serializable {this.buildPreservations = buildPreservations;}+ public List<ActionAuthorization> getActionAuthorizations() {+ return actionAuthorizations;+ }++ public void setActionAuthorizations(List<ActionAuthorization> actionAuthorizations) {+ this.actionAuthorizations = actionAuthorizations;+ }+private GlobalBuildSetting getGlobalSetting() {if (globalSetting == null)globalSetting = OneDev.getInstance(SettingManager.class).getBuildSetting();@@ -90,14 +103,14 @@ public class ProjectBuildSetting implements Serializable {public List<JobSecret> getInheritedSecrets(Project project) {Map<String, JobSecret> inheritedSecrets = new LinkedHashMap<>();- for (JobSecret secret: project.getOwner().getBuildSetting().getSecrets())+ for (JobSecret secret: project.getOwner().getBuildSetting().getJobSecrets())inheritedSecrets.put(secret.getName(), secret);- inheritedSecrets.keySet().removeAll(secrets.stream().map(it->it.getName()).collect(Collectors.toSet()));+ inheritedSecrets.keySet().removeAll(jobSecrets.stream().map(it->it.getName()).collect(Collectors.toSet()));return new ArrayList<>(inheritedSecrets.values());}public List<JobSecret> getHierarchySecrets(Project project) {- List<JobSecret> hierarchySecrets = new ArrayList<>(getSecrets());+ List<JobSecret> hierarchySecrets = new ArrayList<>(getJobSecrets());hierarchySecrets.addAll(getInheritedSecrets(project));return hierarchySecrets;}@@ -120,4 +133,23 @@ public class ProjectBuildSetting implements Serializable {return hierarchyBuildPreservations;}+ public List<ActionAuthorization> getHierarchyActionAuthorizations(Project project) {+ List<ActionAuthorization> hierarchyBranchAuthorizations = new ArrayList<>(getActionAuthorizations());+ hierarchyBranchAuthorizations.addAll(project.getOwner().getBuildSetting().getActionAuthorizations());+ return hierarchyBranchAuthorizations;+ }++ public boolean isActionAuthorized(Build build, PostBuildAction action) {+ List<ActionAuthorization> authorizations = getHierarchyActionAuthorizations(build.getProject());+ if (!authorizations.isEmpty()) {+ for (ActionAuthorization authorization: authorizations) {+ if (authorization.isAuthorized(build, action))+ return true;+ }+ return false;+ } else {+ return true;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/UserBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/UserBuildSetting.javanew file mode 100644index 0000000000..b105bca0b4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/build/UserBuildSetting.java@@ -0,0 +1,45 @@+package io.onedev.server.model.support.build;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class UserBuildSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<JobSecret> jobSecrets = new ArrayList<>();++ private List<BuildPreservation> buildPreservations = new ArrayList<>();++ private List<ActionAuthorization> actionAuthorizations = new ArrayList<>();++ public List<JobSecret> getJobSecrets() {+ return jobSecrets;+ }++ public void setJobSecrets(List<JobSecret> jobSecrets) {+ this.jobSecrets = jobSecrets;+ }++ public List<BuildPreservation> getBuildPreservations() {+ return buildPreservations;+ }++ public void setBuildPreservations(List<BuildPreservation> buildPreservations) {+ this.buildPreservations = buildPreservations;+ }++ public List<ActionAuthorization> getActionAuthorizations() {+ return actionAuthorizations;+ }++ public void setActionAuthorizations(List<ActionAuthorization> actionAuthorizations) {+ this.actionAuthorizations = actionAuthorizations;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.javanew file mode 100644index 0000000000..1cbc2ad646--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java@@ -0,0 +1,53 @@+package io.onedev.server.model.support.build.actionauthorization;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.buildspec.job.action.PostBuildAction;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++@Editable+public abstract class ActionAuthorization implements Serializable {++ private static final long serialVersionUID = 1L;++ private String authorizedBranches;++ @Editable(order=1000, description="Action is allowed only if build runs on "+ + "specified branches. Multiple branches should be separated with space. "+ + "Use * or ? for wildcard match")+ @Patterns(suggester = "suggestBranches")+ @NameOfEmptyValue("All")+ public String getAuthorizedBranches() {+ return authorizedBranches;+ }++ public void setAuthorizedBranches(String authorizedBranches) {+ this.authorizedBranches = authorizedBranches;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestBranches(String matchWith) {+ Project project = Project.get();+ if (project != null)+ return SuggestionUtils.suggestBranches(project, matchWith);+ else+ return new ArrayList<>();+ }++ public boolean isAuthorized(Build build, PostBuildAction postBuildAction) {+ return matches(postBuildAction) && (authorizedBranches == null || build.getProject().isCommitOnBranches(build.getCommitId(), authorizedBranches));+ }++ protected abstract boolean matches(PostBuildAction postBuildAction);++ public abstract String getActionDescription();++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.javanew file mode 100644index 0000000000..32fc58d09c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java@@ -0,0 +1,60 @@+package io.onedev.server.model.support.build.actionauthorization;++import java.util.ArrayList;+import java.util.List;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.buildspec.job.action.CloseMilestoneAction;+import io.onedev.server.buildspec.job.action.PostBuildAction;+import io.onedev.server.model.Project;+import io.onedev.server.util.match.WildcardUtils;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++@Editable(order=200, name="Close milestone")+public class CloseMilestoneAuthorization extends ActionAuthorization {++ private static final long serialVersionUID = 1L;++ private String milestoneNames;++ @Editable(order=100, description="Specify space-separated milestone names. Use * or ? for wildcard match")+ @Patterns(suggester = "suggestMilestones")+ @NameOfEmptyValue("All")+ public String getMilestoneNames() {+ return milestoneNames;+ }++ public void setMilestoneNames(String milestoneNames) {+ this.milestoneNames = milestoneNames;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestMilestones(String matchWith) {+ if (Project.get() != null)+ return SuggestionUtils.suggestMilestones(Project.get(), matchWith);+ else+ return new ArrayList<>();+ }++ @Override+ public boolean matches(PostBuildAction postBuildAction) {+ if (postBuildAction instanceof CloseMilestoneAction) {+ CloseMilestoneAction closeMilestoneAction = (CloseMilestoneAction) postBuildAction;+ return milestoneNames == null || WildcardUtils.matchPath(milestoneNames, closeMilestoneAction.getMilestoneName());+ } else {+ return false;+ }+ }++ @Override+ public String getActionDescription() {+ if (milestoneNames != null)+ return "Close milestone with name matching '" + milestoneNames + "'";+ else+ return "Close milestone";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.javanew file mode 100644index 0000000000..e1980384b9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java@@ -0,0 +1,60 @@+package io.onedev.server.model.support.build.actionauthorization;++import java.util.ArrayList;+import java.util.List;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.server.buildspec.job.action.CreateTagAction;+import io.onedev.server.buildspec.job.action.PostBuildAction;+import io.onedev.server.model.Project;+import io.onedev.server.util.match.WildcardUtils;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.Patterns;+import io.onedev.server.web.util.SuggestionUtils;++@Editable(order=100, name="Create tag")+public class CreateTagAuthorization extends ActionAuthorization {++ private static final long serialVersionUID = 1L;++ private String tagNames;++ @Editable(order=100, description="Specify space-separated tag names. Use * or ? for wildcard match")+ @Patterns(suggester = "suggestTags")+ @NameOfEmptyValue("All")+ public String getTagNames() {+ return tagNames;+ }++ public void setTagNames(String tagNames) {+ this.tagNames = tagNames;+ }++ @SuppressWarnings("unused")+ private static List<InputSuggestion> suggestTags(String matchWith) {+ if (Project.get() != null)+ return SuggestionUtils.suggestTags(Project.get(), matchWith);+ else+ return new ArrayList<>();+ }++ @Override+ public boolean matches(PostBuildAction postBuildAction) {+ if (postBuildAction instanceof CreateTagAction) {+ CreateTagAction createTagAction = (CreateTagAction) postBuildAction;+ return tagNames == null || WildcardUtils.matchPath(tagNames, createTagAction.getTagName());+ } else {+ return false;+ }+ }++ @Override+ public String getActionDescription() {+ if (tagNames != null)+ return "Create tag with name matching '" + tagNames + "'";+ else+ return "Create tag";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 9c1a04b752..afe64c22ec 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -37,8 +37,9 @@ import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserActionAuthorizationsPage;import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreservationsPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserSecretsPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserJobSecretsPage;import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;@@ -48,8 +49,9 @@ import io.onedev.server.web.page.build.BuildListPage;import io.onedev.server.web.page.init.ServerInitPage;import io.onedev.server.web.page.issue.IssueListPage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;+import io.onedev.server.web.page.my.buildsetting.MyActionAuthorizationsPage;import io.onedev.server.web.page.my.buildsetting.MyBuildPreservationsPage;-import io.onedev.server.web.page.my.buildsetting.MySecretsPage;+import io.onedev.server.web.page.my.buildsetting.MyJobSecretsPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.webhook.MyWebHooksPage;@@ -88,8 +90,9 @@ import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePimport io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;+import io.onedev.server.web.page.project.setting.build.ProjectActionAuthorizationsPage;import io.onedev.server.web.page.project.setting.build.ProjectBuildPreservationsPage;-import io.onedev.server.web.page.project.setting.build.ProjectSecretsPage;+import io.onedev.server.web.page.project.setting.build.ProjectJobSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;@@ -124,7 +127,8 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("my/profile", MyProfilePage.class));add(new OnePageMapper("my/avatar", MyAvatarPage.class));add(new OnePageMapper("my/password", MyPasswordPage.class));- add(new OnePageMapper("my/build-setting/secrets", MySecretsPage.class));+ add(new OnePageMapper("my/build-setting/job-secrets", MyJobSecretsPage.class));+ add(new OnePageMapper("my/build-setting/action-authorizations", MyActionAuthorizationsPage.class));add(new OnePageMapper("my/build-setting/build-preserve-rules", MyBuildPreservationsPage.class));add(new OnePageMapper("my/web-hooks", MyWebHooksPage.class));}@@ -156,8 +160,9 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));- add(new OnePageMapper("administration/users/${user}/build-setting", UserSecretsPage.class));- add(new OnePageMapper("administration/users/${user}/build-setting/secrets", UserSecretsPage.class));+ add(new OnePageMapper("administration/users/${user}/build-setting", UserJobSecretsPage.class));+ add(new OnePageMapper("administration/users/${user}/build-setting/job-secrets", UserJobSecretsPage.class));+ add(new OnePageMapper("administration/users/${user}/build-setting/action-authorizations", UserActionAuthorizationsPage.class));add(new OnePageMapper("administration/users/${user}/build-setting/build-preserve-rules", UserBuildPreservationsPage.class));add(new OnePageMapper("administration/users/${user}/web-hooks", UserWebHooksPage.class));@@ -243,7 +248,8 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionsPage.class));add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionsPage.class));- add(new OnePageMapper("projects/${project}/settings/build/secrets", ProjectSecretsPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/job-secrets", ProjectJobSecretsPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/action-authorizations", ProjectActionAuthorizationsPage.class));add(new OnePageMapper("projects/${project}/settings/build/build-preserve-rules", ProjectBuildPreservationsPage.class));add(new OnePageMapper("projects/${project}/settings/issue/state-transitions", StateTransitionsPage.class));add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.htmlnew file mode 100644index 0000000000..5cf949df7f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="build-preservation-list">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" value="Save" class="dirty-aware btn btn-primary">+ </div>+ </form>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.javanew file mode 100644index 0000000000..36b131e5fc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.java@@ -0,0 +1,46 @@+package io.onedev.server.web.component.build.authorization;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public abstract class ActionAuthorizationListPanel extends Panel {++ private final ActionAuthorizationsBean bean;++ public ActionAuthorizationListPanel(String id, ActionAuthorizationsBean bean) {+ super(id);+ this.bean = bean;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "actionAuthorizations");++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ getSession().success("Action authorization rules saved");+ onSaved(bean.getActionAuthorizations());+ }++ };+ form.add(new NotificationPanel("feedback", form));+ form.add(editor);+ add(form);+ }++ protected abstract void onSaved(List<ActionAuthorization> actionAuthorizations);+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationsBean.java b/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationsBean.javanew file mode 100644index 0000000000..f70aa17122--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationsBean.java@@ -0,0 +1,26 @@+package io.onedev.server.web.component.build.authorization;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class ActionAuthorizationsBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<ActionAuthorization> actionAuthorizations = new ArrayList<>();++ @Editable+ public List<ActionAuthorization> getActionAuthorizations() {+ return actionAuthorizations;+ }++ public void setActionAuthorizations(List<ActionAuthorization> actionAuthorizations) {+ this.actionAuthorizations = actionAuthorizations;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.javaindex c7d4717d8c..6e4e9c674a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.model.support.build.BuildPreservation;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.java b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.javaindex 61a13fa076..c7b9d5e0a0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.model.support.build.BuildPreservation;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.javasimilarity index 92%rename from server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.javaindex 4dc731030f..3024a81052 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.job.secret;+package io.onedev.server.web.component.build.secret;import java.io.Serializable;import java.util.HashSet;@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.model.support.JobSecret;+import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretsBean.java b/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretsBean.javasimilarity index 81%rename from server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretsBean.javarename to server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretsBean.javaindex 2d3b65b617..78a258024f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/secret/JobSecretsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretsBean.java@@ -1,10 +1,10 @@-package io.onedev.server.web.component.job.secret;+package io.onedev.server.web.component.build.secret;import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import io.onedev.server.model.support.JobSecret;+import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.javaindex 86d8b408a0..aa0be5bc14 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java@@ -6,7 +6,7 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.model.support.JobSecret;+import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.page.project.blob.ProjectBlobPage;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationBean.javanew file mode 100644index 0000000000..b65aaeb965--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationBean.java@@ -0,0 +1,27 @@+package io.onedev.server.web.editable.build.actionauthorization;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class ActionAuthorizationBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private ActionAuthorization authorization;++ @Editable(name="Type", order=100)+ @NotNull(message="may not be empty")+ public ActionAuthorization getAuthorization() {+ return authorization;+ }++ public void setAuthorization(ActionAuthorization authorization) {+ this.authorization = authorization;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationCssResourceReference.javanew file mode 100644index 0000000000..69745e7def--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.build.actionauthorization;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ActionAuthorizationCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ActionAuthorizationCssResourceReference() {+ super(ActionAuthorizationCssResourceReference.class, "action-authorization.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.htmlnew file mode 100644index 0000000000..37b5ede8da--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <form wicket:id="form" class="action-authorization-edit leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Action Authorization+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.javanew file mode 100644index 0000000000..e111deec24--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationEditPanel.java@@ -0,0 +1,111 @@+package io.onedev.server.web.editable.build.actionauthorization;++import java.util.List;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;++@SuppressWarnings("serial")+abstract class ActionAuthorizationEditPanel extends Panel {++ private final List<ActionAuthorization> authorizations;++ private final int authorizationIndex;++ public ActionAuthorizationEditPanel(String id, List<ActionAuthorization> authorizations, int authorizationIndex) {+ super(id);++ this.authorizations = authorizations;+ this.authorizationIndex = authorizationIndex;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ActionAuthorizationBean bean = new ActionAuthorizationBean();+ if (authorizationIndex != -1)+ bean.setAuthorization(authorizations.get(authorizationIndex));++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ActionAuthorizationEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ BeanEditor editor = BeanContext.edit("editor", bean);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ ActionAuthorization trigger = bean.getAuthorization();+ if (editor.isValid()) {+ if (authorizationIndex != -1) {+ authorizations.set(authorizationIndex, trigger);+ } else {+ authorizations.add(trigger);+ }+ onSave(target);+ } else {+ target.add(form);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ActionAuthorizationEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);++ add(form);+ }++ protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.htmlnew file mode 100644index 0000000000..4df5e5a678--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.html@@ -0,0 +1,12 @@+<wicket:panel>+ <div class="action-authorization-list list">+ <div class="head">+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a>+ </div>+ <table wicket:id="authorizations" class="table table-condensed table-hover"></table>+ </div>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>+ <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.javanew file mode 100644index 0000000000..a51d9b46e0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditPanel.java@@ -0,0 +1,215 @@+package io.onedev.server.web.editable.build.actionauthorization;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collections;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyUpdating;++@SuppressWarnings("serial")+class ActionAuthorizationListEditPanel extends PropertyEditor<List<Serializable>> {++ private final List<ActionAuthorization> authorizations;++ public ActionAuthorizationListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ authorizations = new ArrayList<>();+ for (Serializable each: model.getObject()) {+ authorizations.add((ActionAuthorization) each);+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new ModalLink("addNew") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new ActionAuthorizationEditPanel(id, authorizations, -1) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ markFormDirty(target);+ modal.close();+ onPropertyUpdating(target);+ target.add(ActionAuthorizationListEditPanel.this);+ }++ };+ }++ });++ List<IColumn<ActionAuthorization, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {+ cellItem.add(new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span>").setEscapeModelStrings(false));+ }++ @Override+ public String getCssClass() {+ return "minimum actions";+ }++ });++ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Action")) {++ @Override+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getActionDescription()));+ }+ });++ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Authorized Branches")) {++ @Override+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {+ String authorizedBranches = rowModel.getObject().getAuthorizedBranches();+ if (authorizedBranches != null)+ cellItem.add(new Label(componentId, authorizedBranches));+ else+ cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));+ }++ });++ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", ActionAuthorizationListEditPanel.this);+ fragment.add(new ModalLink("edit") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new ActionAuthorizationEditPanel(id, authorizations, cellItem.findParent(Item.class).getIndex()) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ markFormDirty(target);+ modal.close();+ onPropertyUpdating(target);+ target.add(ActionAuthorizationListEditPanel.this);+ }++ };+ }++ });+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ markFormDirty(target);+ authorizations.remove(rowModel.getObject());+ onPropertyUpdating(target);+ target.add(ActionAuthorizationListEditPanel.this);+ }++ });+ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";+ }++ });++ IDataProvider<ActionAuthorization> dataProvider = new ListDataProvider<ActionAuthorization>() {++ @Override+ protected List<ActionAuthorization> getData() {+ return authorizations;+ }++ };++ DataTable<ActionAuthorization, Void> dataTable;+ add(dataTable = new DataTable<ActionAuthorization, Void>("authorizations", columns, dataProvider, Integer.MAX_VALUE));+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));++ dataTable.add(new SortBehavior() {++ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ Collections.swap(authorizations, fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ Collections.swap(authorizations, fromIndex-i, fromIndex-i-1);+ }+ onPropertyUpdating(target);+ target.add(ActionAuthorizationListEditPanel.this);+ }++ }.sortable("tbody"));+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (ActionAuthorization each: authorizations)+ value.add(each);+ return value;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditSupport.javanew file mode 100644index 0000000000..bbe662ac16--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListEditSupport.java@@ -0,0 +1,60 @@+package io.onedev.server.web.editable.build.actionauthorization;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.util.ReflectionUtils;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class ActionAuthorizationListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass == ActionAuthorization.class) {+ return new PropertyContext<List<Serializable>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new ActionAuthorizationListViewPanel(id, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {+ return new ActionAuthorizationListEditPanel(componentId, descriptor, model);+ }++ };+ }+ }+ return null;+ }++ @Override+ public int getPriority() {+ return 0;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.htmlnew file mode 100644index 0000000000..6a46b8acb6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.html@@ -0,0 +1,10 @@+<wicket:panel>+ <div class="def-list action-authorization-list">+ <div class="body">+ <table wicket:id="authorizations" class="table table-condensed table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="columnFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.javanew file mode 100644index 0000000000..81a54a0c3f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/ActionAuthorizationListViewPanel.java@@ -0,0 +1,92 @@+package io.onedev.server.web.editable.build.actionauthorization;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.data.ListDataProvider;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;++@SuppressWarnings("serial")+class ActionAuthorizationListViewPanel extends Panel {++ private final List<ActionAuthorization> authorizations = new ArrayList<>();++ public ActionAuthorizationListViewPanel(String id, List<Serializable> elements) {+ super(id);++ for (Serializable each: elements)+ authorizations.add((ActionAuthorization) each);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<IColumn<ActionAuthorization, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Action")) {++ @Override+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getActionDescription()));+ }++ });++ columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Authorized Branches")) {++ @Override+ public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId, IModel<ActionAuthorization> rowModel) {+ String authorizedBranches = rowModel.getObject().getAuthorizedBranches();+ if (authorizedBranches != null)+ cellItem.add(new Label(componentId, authorizedBranches));+ else+ cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));+ }++ });++ IDataProvider<ActionAuthorization> dataProvider = new ListDataProvider<ActionAuthorization>() {++ @Override+ protected List<ActionAuthorization> getData() {+ return authorizations;+ }++ };++ add(new DataTable<ActionAuthorization, Void>("authorizations", columns, dataProvider, Integer.MAX_VALUE) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ addTopToolbar(new HeadersToolbar<Void>(this, null));+ addBottomToolbar(new NoRecordsToolbar(this));+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ActionAuthorizationCssResourceReference()));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/action-authorization.css b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/action-authorization.cssnew file mode 100644index 0000000000..2d1f6d0d80--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/actionauthorization/action-authorization.css@@ -0,0 +1,3 @@+.def-list.action-authorization-list table>tbody>tr>td {+ padding: 5px;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerCssResourceReference.javadeleted file mode 100644index bd271a0c77..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.editable.job.trigger;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class JobTriggerCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public JobTriggerCssResourceReference() {- super(JobTriggerCssResourceReference.class, "job-trigger.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.htmlindex e30bfdddaa..579fb40720 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="trigger-list list">+ <div class="job-trigger-list list"><div class="head"><a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.javaindex e60eec8902..30c25da572 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListEditPanel.java@@ -15,8 +15,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;@@ -230,10 +228,4 @@ class JobTriggerListEditPanel extends PropertyEditor<List<Serializable>> {return value;}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new JobTriggerCssResourceReference()));- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.htmlindex c67b36d0ab..ce5c0034eb 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="def-list trigger-list">+ <div class="def-list job-trigger-list"><div class="body"><table wicket:id="triggers" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.javaindex db5e29b2ea..4ccbd5d876 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/JobTriggerListViewPanel.java@@ -14,8 +14,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;@@ -124,12 +122,6 @@ class JobTriggerListViewPanel extends Panel {});}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new JobTriggerCssResourceReference()));- }-private abstract class ColumnFragment extends Fragment {private final int index;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/job-trigger.css b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/job-trigger.cssdeleted file mode 100644index 7ce58ee60a..0000000000--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/job-trigger.css+++ /dev/null@@ -1,5 +0,0 @@-.floating.job-trigger td.name {- width: 160px !important;- word-break: break-all !important;- white-space: normal !important;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.htmlindex 2f84381897..bf043019a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/authorization/GroupAuthorizationsPage.html@@ -4,7 +4,7 @@<div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary" value="Update">+ <input type="submit" class="btn btn-primary" value="Save"></div></form></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex a5c0de73d3..24001c3453 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -31,7 +31,7 @@ import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;import io.onedev.server.web.page.admin.user.buildsetting.UserBuildSettingPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserSecretsPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserJobSecretsPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;@@ -98,7 +98,7 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));- tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserSecretsPage.class, UserBuildSettingPage.class));+ tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserJobSecretsPage.class, UserBuildSettingPage.class));tabs.add(new UserTab("Web Hooks", "fa fa-fw fa-volume-up", UserWebHooksPage.class, UserWebHooksPage.class));return tabs;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.htmlindex 2f84381897..bf043019a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/authorization/UserAuthorizationsPage.html@@ -4,7 +4,7 @@<div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary" value="Update">+ <input type="submit" class="btn btn-primary" value="Save"></div></form></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.htmlnew file mode 100644index 0000000000..9eda6f96cf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.html@@ -0,0 +1,6 @@+<wicket:extend>+ <div class="help-block">Define common rules to authorize build actions for all projects owned+ by current user. A build action will be allowed as long as one rule allows it. All build actions+ will be allowed if no rules defined</div>+ <div wicket:id="actionAuthorizations"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.javanew file mode 100644index 0000000000..0bd6d2e139--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.java@@ -0,0 +1,39 @@+package io.onedev.server.web.page.admin.user.buildsetting;++import java.util.List;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.component.build.authorization.ActionAuthorizationListPanel;+import io.onedev.server.web.component.build.authorization.ActionAuthorizationsBean;++@SuppressWarnings("serial")+public class UserActionAuthorizationsPage extends UserBuildSettingPage {++ public UserActionAuthorizationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ActionAuthorizationsBean bean = new ActionAuthorizationsBean();+ bean.setActionAuthorizations(getBuildSetting().getActionAuthorizations());+ add(new ActionAuthorizationListPanel("actionAuthorizations", bean) {++ @Override+ protected void onSaved(List<ActionAuthorization> actionAuthorizations) {+ getBuildSetting().setActionAuthorizations(actionAuthorizations);+ OneDev.getInstance(UserManager.class).save(getUser());+ setResponsePage(UserActionAuthorizationsPage.class,+ UserActionAuthorizationsPage.paramsOf(getUser()));+ }++ });+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.javaindex 23fd93034a..524d4b3375 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.java@@ -6,7 +6,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.model.support.build.BuildPreservation;import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.javaindex 6a9b25bcef..6e394be8aa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java@@ -5,7 +5,7 @@ import java.util.List;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.model.support.UserBuildSetting;+import io.onedev.server.model.support.build.UserBuildSetting;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.admin.user.UserPage;@@ -23,7 +23,8 @@ public abstract class UserBuildSettingPage extends UserPage {super.onInitialize();List<Tab> tabs = new ArrayList<>();- tabs.add(new UserTab("Secrets", null, UserSecretsPage.class));+ tabs.add(new UserTab("Job Secrets", null, UserJobSecretsPage.class));+ tabs.add(new UserTab("Action Authorizations", null, UserActionAuthorizationsPage.class));tabs.add(new UserTab("Build Preserve Rules", null, UserBuildPreservationsPage.class));add(new Tabbable("buildSettingTabs", tabs));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.htmlsimilarity index 55%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.htmlindex 8bea17cb9b..591512083d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.html@@ -1,4 +1,4 @@<wicket:extend><div wicket:id="note" class="help-block"></div>- <div wicket:id="secrets"></div>+ <div wicket:id="jobSecrets"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.javasimilarity index 57%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.javaindex 64d2a4218e..b3efcaed50 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserSecretsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.java@@ -7,15 +7,15 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.JobSecret;+import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.component.job.secret.JobSecretListPanel;-import io.onedev.server.web.component.job.secret.JobSecretsBean;+import io.onedev.server.web.component.build.secret.JobSecretListPanel;+import io.onedev.server.web.component.build.secret.JobSecretsBean;@SuppressWarnings("serial")-public class UserSecretsPage extends UserBuildSettingPage {+public class UserJobSecretsPage extends UserBuildSettingPage {- public UserSecretsPage(PageParameters params) {+ public UserJobSecretsPage(PageParameters params) {super(params);}@@ -24,19 +24,19 @@ public class UserSecretsPage extends UserBuildSettingPage {super.onInitialize();JobSecretsBean bean = new JobSecretsBean();- bean.setSecrets(getBuildSetting().getSecrets());- add(new JobSecretListPanel("secrets", bean) {+ bean.setSecrets(getBuildSetting().getJobSecrets());+ add(new JobSecretListPanel("jobSecrets", bean) {@Overrideprotected void onSaved(List<JobSecret> secrets) {- getBuildSetting().setSecrets(secrets);+ getBuildSetting().setJobSecrets(secrets);OneDev.getInstance(UserManager.class).save(getUser());- setResponsePage(UserSecretsPage.class, UserSecretsPage.paramsOf(getUser()));+ setResponsePage(UserJobSecretsPage.class, UserJobSecretsPage.paramsOf(getUser()));}});- String note = String.format("Define common secrets to be used in build jobs of all projects "+ String note = String.format("Define common job secrets to be used in all projects "+ "owned by current user. Secret value less than %d characters will not be masked "+ "in build log", SecretInput.MASK.length());add(new Label("note", note).setEscapeModelStrings(false));diff --git a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.javaindex d7681caa9d..9eebcbbd5c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java@@ -16,10 +16,10 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalBuildSetting;+import io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 74309b3560..8f31855503 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -47,7 +47,7 @@ import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.my.MyPage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.my.buildsetting.MyBuildSettingPage;-import io.onedev.server.web.page.my.buildsetting.MySecretsPage;+import io.onedev.server.web.page.my.buildsetting.MyJobSecretsPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.webhook.MyWebHooksPage;@@ -204,7 +204,7 @@ public abstract class LayoutPage extends BasePage {item.add(AttributeAppender.append("class", "active"));signedInContainer.add(item = new WebMarkupContainer("myBuildSetting"));- item.add(new ViewStateAwarePageLink<Void>("link", MySecretsPage.class));+ item.add(new ViewStateAwarePageLink<Void>("link", MyJobSecretsPage.class));if (getPage() instanceof MyBuildSettingPage)item.add(AttributeAppender.append("class", "active"));diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.htmlnew file mode 100644index 0000000000..8b62918d79--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.html@@ -0,0 +1,6 @@+<wicket:extend>+ <div class="help-block">Define common rules to authorize build actions of all projects owned by me.+ A build action will be allowed as long as one rule allows it. All build actions will be allowed+ if no rules defined</div>+ <div wicket:id="actionAuthorizations"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.javanew file mode 100644index 0000000000..1af36eb28f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.java@@ -0,0 +1,38 @@+package io.onedev.server.web.page.my.buildsetting;++import java.util.List;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.component.build.authorization.ActionAuthorizationListPanel;+import io.onedev.server.web.component.build.authorization.ActionAuthorizationsBean;++@SuppressWarnings("serial")+public class MyActionAuthorizationsPage extends MyBuildSettingPage {++ public MyActionAuthorizationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ActionAuthorizationsBean bean = new ActionAuthorizationsBean();+ bean.setActionAuthorizations(getBuildSetting().getActionAuthorizations());+ add(new ActionAuthorizationListPanel("actionAuthorizations", bean) {++ @Override+ protected void onSaved(List<ActionAuthorization> actionAuthorizations) {+ getBuildSetting().setActionAuthorizations(actionAuthorizations);+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ setResponsePage(MyActionAuthorizationsPage.class);+ }++ });+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.htmlindex 9ac6adbaca..e2eef3e8b5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.html@@ -1,6 +1,6 @@<wicket:extend><div class="help-block">Define common rules to preserve builds of all projects owned by me.A build will be preserved as long as one rule preserves it. All builds will be preserved- if no rules are defined</div>+ if no rules defined</div><div wicket:id="buildPreservations"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.javaindex 0af56bb7c1..74a6da539c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.java@@ -6,7 +6,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.model.support.build.BuildPreservation;import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.javaindex dde66e9acb..758638d342 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java@@ -6,7 +6,7 @@ import java.util.List;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.model.support.UserBuildSetting;+import io.onedev.server.model.support.build.UserBuildSetting;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;@@ -24,7 +24,8 @@ public abstract class MyBuildSettingPage extends MyPage {super.onInitialize();List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Secrets"), MySecretsPage.class));+ tabs.add(new PageTab(Model.of("Job Secrets"), MyJobSecretsPage.class));+ tabs.add(new PageTab(Model.of("Action Authorizations"), MyActionAuthorizationsPage.class));tabs.add(new PageTab(Model.of("Build Preserve Rules"), MyBuildPreservationsPage.class));add(new Tabbable("buildSettingTabs", tabs));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.htmlsimilarity index 55%rename from server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.htmlindex 8bea17cb9b..591512083d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.html@@ -1,4 +1,4 @@<wicket:extend><div wicket:id="note" class="help-block"></div>- <div wicket:id="secrets"></div>+ <div wicket:id="jobSecrets"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.javasimilarity index 58%rename from server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.javaindex a35b4ca77f..fabd2518bc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MySecretsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.java@@ -7,15 +7,15 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.JobSecret;+import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.component.job.secret.JobSecretListPanel;-import io.onedev.server.web.component.job.secret.JobSecretsBean;+import io.onedev.server.web.component.build.secret.JobSecretListPanel;+import io.onedev.server.web.component.build.secret.JobSecretsBean;@SuppressWarnings("serial")-public class MySecretsPage extends MyBuildSettingPage {+public class MyJobSecretsPage extends MyBuildSettingPage {- public MySecretsPage(PageParameters params) {+ public MyJobSecretsPage(PageParameters params) {super(params);}@@ -24,19 +24,19 @@ public class MySecretsPage extends MyBuildSettingPage {super.onInitialize();JobSecretsBean bean = new JobSecretsBean();- bean.setSecrets(getBuildSetting().getSecrets());- add(new JobSecretListPanel("secrets", bean) {+ bean.setSecrets(getBuildSetting().getJobSecrets());+ add(new JobSecretListPanel("jobSecrets", bean) {@Overrideprotected void onSaved(List<JobSecret> secrets) {- getBuildSetting().setSecrets(secrets);+ getBuildSetting().setJobSecrets(secrets);OneDev.getInstance(UserManager.class).save(getLoginUser());- setResponsePage(MySecretsPage.class);+ setResponsePage(MyJobSecretsPage.class);}});- String note = String.format("Define common secrets to be used in build jobs of all projects "+ String note = String.format("Define common job secrets to be used in all projects "+ "owned by me. Secret value less than %d characters will not be masked "+ "in build log", SecretInput.MASK.length());add(new Label("note", note).setEscapeModelStrings(false));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 56cd44734a..db877cded2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -61,7 +61,7 @@ import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizatimport io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;import io.onedev.server.web.page.project.setting.build.ProjectBuildSettingPage;-import io.onedev.server.web.page.project.setting.build.ProjectSecretsPage;+import io.onedev.server.web.page.project.setting.build.ProjectJobSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;import io.onedev.server.web.page.project.setting.issue.ProjectIssueSettingPage;import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;@@ -313,7 +313,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug",StateTransitionsPage.class, ProjectIssueSettingPage.class));tabs.add(new ProjectSettingTab("Build Setting", "fa fa-fw fa-cubes",- ProjectSecretsPage.class, ProjectBuildSettingPage.class));+ ProjectJobSecretsPage.class, ProjectBuildSettingPage.class));tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", ProjectWebHooksPage.class));return tabs;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex 474beeb53c..9a1cbeb5a9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -18,11 +18,11 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.BuildQuerySetting;import io.onedev.server.model.Project;-import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.NamedQuery;-import io.onedev.server.model.support.ProjectBuildSetting;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.GlobalBuildSetting;+import io.onedev.server.model.support.build.NamedBuildQuery;+import io.onedev.server.model.support.build.ProjectBuildSetting;import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.htmlindex 70105738a6..420cf69bba 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html@@ -4,7 +4,7 @@<div wicket:id="feedback"></div><div wicket:id="editor"></div><div class="actions">- <input type="submit" class="btn btn-primary" value="Update">+ <input type="submit" class="btn btn-primary" value="Save"></div></form></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.htmlnew file mode 100644index 0000000000..8a50d8905c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.html@@ -0,0 +1,14 @@+<wicket:extend>+ <div class="help-block">Define rules to authorize build actions. A build action will be allowed+ as long as one rule allows it. All build actions will be allowed if no rules defined</div>+ <div class="panel panel-default">+ <div class="panel-heading"><b>Project Specific</b></div>+ <div class="panel-body" wicket:id="projectSpecificActionAuthorizations"></div>+ </div>+ <div class="panel panel-default">+ <div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>+ <div class="panel-body">+ <div wicket:id="inheritedActionAuthorizations"></div>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.javanew file mode 100644index 0000000000..2aa3ea4f44--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.java@@ -0,0 +1,50 @@+package io.onedev.server.web.page.project.setting.build;++import java.util.List;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;+import io.onedev.server.web.component.build.authorization.ActionAuthorizationListPanel;+import io.onedev.server.web.component.build.authorization.ActionAuthorizationsBean;+import io.onedev.server.web.component.link.SettingInOwnerLink;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.page.admin.user.buildsetting.UserActionAuthorizationsPage;+import io.onedev.server.web.page.my.buildsetting.MyActionAuthorizationsPage;++@SuppressWarnings("serial")+public class ProjectActionAuthorizationsPage extends ProjectBuildSettingPage {++ public ProjectActionAuthorizationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ActionAuthorizationsBean bean = new ActionAuthorizationsBean();+ bean.setActionAuthorizations(getProject().getBuildSetting().getActionAuthorizations());+ add(new ActionAuthorizationListPanel("projectSpecificActionAuthorizations", bean) {++ @Override+ protected void onSaved(List<ActionAuthorization> actionAuthorizations) {+ getProject().getBuildSetting().setActionAuthorizations(actionAuthorizations);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(ProjectActionAuthorizationsPage.class,+ ProjectActionAuthorizationsPage.paramsOf(getProject()));+ }++ });++ add(PropertyContext.view("inheritedActionAuthorizations",+ getProject().getOwner().getBuildSetting(), "actionAuthorizations"));++ add(new SettingInOwnerLink("owner", projectModel, UserActionAuthorizationsPage.class,+ MyActionAuthorizationsPage.class));++ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.javaindex 15541e1b2d..8565c33f4a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.java@@ -6,7 +6,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.BuildPreservation;+import io.onedev.server.model.support.build.BuildPreservation;import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;import io.onedev.server.web.component.link.SettingInOwnerLink;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.javaindex 9b0db9714a..06849a20a3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java@@ -29,13 +29,21 @@ public abstract class ProjectBuildSettingPage extends ProjectSettingPage {super.onInitialize();List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Secrets"), ProjectSecretsPage.class) {+ tabs.add(new PageTab(Model.of("Job Secrets"), ProjectJobSecretsPage.class) {@Overridepublic Component render(String componentId) {return new TabLink(componentId, this);}+ });+ tabs.add(new PageTab(Model.of("Action Authorizations"), ProjectActionAuthorizationsPage.class) {++ @Override+ public Component render(String componentId) {+ return new TabLink(componentId, this);+ }+});tabs.add(new PageTab(Model.of("Build Preserve Rules"), ProjectBuildPreservationsPage.class) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.htmlsimilarity index 71%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.htmlindex 68b3896c2d..73708eb80f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.html@@ -2,12 +2,12 @@<div wicket:id="note" class="help-block"></div><div class="panel panel-default"><div class="panel-heading"><b>Project Specific</b></div>- <div wicket:id="projectSpecificSecrets" class="panel-body"></div>+ <div wicket:id="projectSpecificJobSecrets" class="panel-body"></div></div><div class="panel panel-default"><div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div><div class="panel-body">- <div wicket:id="inheritedSecrets"></div>+ <div wicket:id="inheritedJobSecrets"></div></div></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.javasimilarity index 52%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.javaindex 3ac1734071..d3d06e815e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.java@@ -7,19 +7,19 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.JobSecret;+import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.component.job.secret.JobSecretListPanel;-import io.onedev.server.web.component.job.secret.JobSecretsBean;+import io.onedev.server.web.component.build.secret.JobSecretListPanel;+import io.onedev.server.web.component.build.secret.JobSecretsBean;import io.onedev.server.web.component.link.SettingInOwnerLink;import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.page.admin.user.buildsetting.UserSecretsPage;-import io.onedev.server.web.page.my.buildsetting.MySecretsPage;+import io.onedev.server.web.page.admin.user.buildsetting.UserJobSecretsPage;+import io.onedev.server.web.page.my.buildsetting.MyJobSecretsPage;@SuppressWarnings("serial")-public class ProjectSecretsPage extends ProjectBuildSettingPage {+public class ProjectJobSecretsPage extends ProjectBuildSettingPage {- public ProjectSecretsPage(PageParameters params) {+ public ProjectJobSecretsPage(PageParameters params) {super(params);}@@ -27,19 +27,19 @@ public class ProjectSecretsPage extends ProjectBuildSettingPage {protected void onInitialize() {super.onInitialize();- String note = String.format("Define secrets to be used in build jobs. Secret value less "+ String note = String.format("Define job secrets to be used in build spec. Secret value less "+ "than %d characters will not be masked in build log", SecretInput.MASK.length());add(new Label("note", note).setEscapeModelStrings(false));JobSecretsBean bean = new JobSecretsBean();- bean.setSecrets(getProject().getBuildSetting().getSecrets());- add(new JobSecretListPanel("projectSpecificSecrets", bean) {+ bean.setSecrets(getProject().getBuildSetting().getJobSecrets());+ add(new JobSecretListPanel("projectSpecificJobSecrets", bean) {@Overrideprotected void onSaved(List<JobSecret> secrets) {- getProject().getBuildSetting().setSecrets(secrets);+ getProject().getBuildSetting().setJobSecrets(secrets);OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(ProjectSecretsPage.class, ProjectSecretsPage.paramsOf(getProject()));+ setResponsePage(ProjectJobSecretsPage.class, ProjectJobSecretsPage.paramsOf(getProject()));}});@@ -47,9 +47,9 @@ public class ProjectSecretsPage extends ProjectBuildSettingPage {List<JobSecret> inheritedSecrets = getProject().getBuildSetting().getInheritedSecrets(getProject());bean = new JobSecretsBean();bean.setSecrets(inheritedSecrets);- add(PropertyContext.view("inheritedSecrets", bean, "secrets"));+ add(PropertyContext.view("inheritedJobSecrets", bean, "secrets"));- add(new SettingInOwnerLink("owner", projectModel, UserSecretsPage.class, MySecretsPage.class));+ add(new SettingInOwnerLink("owner", projectModel, UserJobSecretsPage.class, MyJobSecretsPage.class));}}diff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.javaindex 1917df670b..ab63a959f5 100644--- a/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.java@@ -5,7 +5,7 @@ import java.util.List;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.NamedBuildQuery;+import io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 8cc3b97fd8..ada5e6e9d9 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -46,8 +46,8 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-import io.onedev.server.model.support.JobSecret;import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.model.support.build.JobSecret;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.match.PatternApplied;