The Unified and Autonomous Development Platform
Change some phrases for easier understanding
Robin Shenc791abeadc03
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex eec2369413..ee5eec324c 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -212,12 +212,10 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeif (transition.getTrigger() instanceof BuildSuccessfulTrigger) {BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();String branches = trigger.getBranches();- String tags = trigger.getTags();ObjectId commitId = ObjectId.fromString(event.getBuild().getCommitHash());if (trigger.getJobName().equals(event.getBuild().getJobName())&& event.getBuild().getStatus() == Build.Status.SUCCESSFUL- && (branches == null || project.isCommitOnBranches(commitId, branches))- && (tags == null || project.isCommitOnTags(commitId, tags))) {+ && (branches == null || project.isCommitOnBranches(commitId, branches))) {Long buildId = event.getBuild().getId();/*diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 8217d9c75e..99a8ef6c53 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -175,7 +175,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemif (oldName != null && !oldName.equals(project.getName())) {for (JobExecutor jobExecutor: settingManager.getJobExecutors())- jobExecutor.onProjectRenamed(oldName, project.getName());+ jobExecutor.onRenameProject(oldName, project.getName());}}@@ -185,7 +185,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implempublic void delete(Project project) {Usage usage = new Usage();for (JobExecutor jobExecutor: settingManager.getJobExecutors())- usage.add(jobExecutor.getProjectUsage(project.getName()).prefix("administration"));+ usage.add(jobExecutor.onDeleteProject(project.getName()).prefix("administration"));usage.checkInUse("Project '" + project.getName() + "'");@@ -381,8 +381,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemit.remove();}- usage.add(project.getIssueSetting().onDeleteTag(tagName));-usage.prefix("project setting").checkInUse("Tag '" + tagName + "'");}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 3f95036730..26ed9c60f3 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -1156,7 +1156,7 @@ public class Project extends AbstractEntity {public TagProtection getTagProtection(String tagName, User user) {for (TagProtection protection: tagProtections) {if (protection.isEnabled()- && UserMatcher.fromString(protection.getSubmitter()).matches(this, user)+ && UserMatcher.fromString(protection.getUser()).matches(this, user)&& PatternSet.fromString(protection.getTags()).matches(new ChildAwareMatcher(), tagName)) {return protection;}@@ -1168,7 +1168,7 @@ public class Project extends AbstractEntity {public BranchProtection getBranchProtection(String branchName, @Nullable User user) {for (BranchProtection protection: branchProtections) {if (protection.isEnabled()- && UserMatcher.fromString(protection.getSubmitter()).matches(this, user)+ && UserMatcher.fromString(protection.getUser()).matches(this, user)&& PatternSet.fromString(protection.getBranches()).matches(new ChildAwareMatcher(), branchName)) {return protection;}@@ -1342,16 +1342,4 @@ public class Project extends AbstractEntity {return false;}- public boolean isCommitOnTags(ObjectId commitId, String tags) {- Matcher matcher = new ChildAwareMatcher();- PatternSet tagPatterns = PatternSet.fromString(tags);- for (RefInfo ref: getTags()) {- String tagName = Preconditions.checkNotNull(GitUtils.ref2tag(ref.getRef().getName()));- if (commitId.equals(ref.getPeeledObj()) && tagPatterns.matches(matcher, tagName))- return true;- }- return false;- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.javaindex 7815ab200e..bceb09f4fd 100644--- a/core/src/main/java/io/onedev/server/model/support/BranchProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java@@ -32,7 +32,7 @@ public class BranchProtection implements Serializable {private String branches;- private String submitter = new Anyone().toString();+ private String user = new Anyone().toString();private boolean noForcedPush = true;@@ -65,16 +65,15 @@ public class BranchProtection implements Serializable {this.branches = branches;}- @Editable(order=150, name="If Submitted By", description="This protection rule will apply "- + "only if the change is submitted by specified users here")+ @Editable(order=150, name="Applicable Users", description="Rule will apply only if the user changing the branch matches criteria specified here")@io.onedev.server.web.editable.annotation.UserMatcher@NotEmpty(message="may not be empty")- public String getSubmitter() {- return submitter;+ public String getUser() {+ return user;}- public void setSubmitter(String submitter) {- this.submitter = submitter;+ public void setUser(String user) {+ this.user = user;}@Editable(order=200, description="Check this to not allow forced push")@@ -147,7 +146,7 @@ public class BranchProtection implements Serializable {}public void onRenameGroup(String oldName, String newName) {- submitter = UserMatcher.onRenameGroup(submitter, oldName, newName);+ user = UserMatcher.onRenameGroup(user, oldName, newName);reviewRequirement = ReviewRequirement.onRenameGroup(reviewRequirement, oldName, newName);for (FileProtection fileProtection: getFileProtections()) {@@ -158,8 +157,8 @@ public class BranchProtection implements Serializable {public Usage onDeleteGroup(String groupName) {Usage usage = new Usage();- if (UserMatcher.isUsingGroup(submitter, groupName))- usage.add("if submitted by");+ if (UserMatcher.isUsingGroup(user, groupName))+ usage.add("applicable users");if (ReviewRequirement.isUsingGroup(reviewRequirement, groupName))usage.add("required reviewers");@@ -173,7 +172,7 @@ public class BranchProtection implements Serializable {}public void onRenameUser(Project project, String oldName, String newName) {- submitter = UserMatcher.onRenameUser(submitter, oldName, newName);+ user = UserMatcher.onRenameUser(user, oldName, newName);reviewRequirement = ReviewRequirement.onRenameUser(reviewRequirement, oldName, newName);for (FileProtection fileProtection: getFileProtections()) {@@ -184,8 +183,8 @@ public class BranchProtection implements Serializable {public Usage onDeleteUser(String userName) {Usage usage = new Usage();- if (UserMatcher.isUsingUser(submitter, userName))- usage.add("if submitted by");+ if (UserMatcher.isUsingUser(user, userName))+ usage.add("applicable users");if (ReviewRequirement.isUsingUser(reviewRequirement, userName))usage.add("required reviewers");diff --git a/core/src/main/java/io/onedev/server/model/support/TagProtection.java b/core/src/main/java/io/onedev/server/model/support/TagProtection.javaindex 16ae90ffdb..ded739e96c 100644--- a/core/src/main/java/io/onedev/server/model/support/TagProtection.java+++ b/core/src/main/java/io/onedev/server/model/support/TagProtection.java@@ -22,7 +22,7 @@ public class TagProtection implements Serializable {private String tags;- private String submitter = new Anyone().toString();+ private String user = new Anyone().toString();private boolean noUpdate = true;@@ -49,16 +49,15 @@ public class TagProtection implements Serializable {this.tags = tags;}- @Editable(order=150, name="If Performed By", description="This protection rule will apply "- + "only if the action is performed by specified users here")+ @Editable(order=150, name="Applicable Users", description="Rule will apply only if the user changing the tag matches criteria specified here")@io.onedev.server.web.editable.annotation.UserMatcher@NotEmpty(message="may not be empty")- public String getSubmitter() {- return submitter;+ public String getUser() {+ return user;}- public void setSubmitter(String submitter) {- this.submitter = submitter;+ public void setUser(String user) {+ this.user = user;}@Editable(order=200, description="Check this to not allow tag update")@@ -89,24 +88,24 @@ public class TagProtection implements Serializable {}public void onRenameGroup(String oldName, String newName) {- submitter = UserMatcher.onRenameGroup(submitter, oldName, newName);+ user = UserMatcher.onRenameGroup(user, oldName, newName);}public Usage onDeleteGroup(String groupName) {Usage usage = new Usage();- if (UserMatcher.isUsingGroup(submitter, groupName))- usage.add("if performed by");+ if (UserMatcher.isUsingGroup(user, groupName))+ usage.add("applicable users");return usage.prefix("tag protection '" + getTags() + "'");}public void onRenameUser(String oldName, String newName) {- submitter = UserMatcher.onRenameUser(submitter, oldName, newName);+ user = UserMatcher.onRenameUser(user, oldName, newName);}public Usage onDeleteUser(String userName) {Usage usage = new Usage();- if (UserMatcher.isUsingUser(submitter, userName))- usage.add("if performed by");+ if (UserMatcher.isUsingUser(user, userName))+ usage.add("applicable users");return usage.prefix("tag protection '" + getTags() + "'");}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.javaindex 675b5d1190..45bd976ad8 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java@@ -134,15 +134,6 @@ public class IssueSetting implements Serializable {return usage.prefix("issue setting");}- public Usage onDeleteTag(String tagName) {- Usage usage = new Usage();- if (transitionSpecs != null) {- for (TransitionSpec transitionSpec: transitionSpecs)- usage.add(transitionSpec.onDeleteTag(tagName));- }- return usage.prefix("issue setting");- }-public Usage onDeleteUser(String userName) {Usage usage = new Usage();if (transitionSpecs != null) {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex 0bf4d34ea3..2e7e3107c3 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -153,16 +153,6 @@ public class TransitionSpec implements Serializable {return usage.prefix("transitions: " + fromStates + "->" + toState);}- public Usage onDeleteTag(String tagName) {- Usage usage = new Usage();- TransitionTrigger trigger = getTrigger();- if (trigger instanceof BuildSuccessfulTrigger) {- BuildSuccessfulTrigger buildSuccessful = (BuildSuccessfulTrigger) trigger;- usage.add(buildSuccessful.onDeleteTag(tagName).prefix("build successful trigger"));- }- return usage.prefix("transitions: " + fromStates + "->" + toState);- }-public Usage onDeleteUser(String userName) {Usage usage = new Usage();TransitionTrigger trigger = getTrigger();diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.javaindex 3107bff4df..8c24d3957d 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java@@ -8,7 +8,6 @@ import io.onedev.server.web.editable.annotation.BranchPatterns;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.JobChoice;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.editable.annotation.TagPatterns;@Editable(order=400, name="Build fixing the issue is successful")public class BuildSuccessfulTrigger implements TransitionTrigger {@@ -19,8 +18,6 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {private String branches;- private String tags;-@Editable(order=100, description="Specify job of the build")@JobChoice@NotEmpty@@ -32,10 +29,10 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {this.jobName = jobName;}- @Editable(order=200, name="Restricted Branches", description="Optionally specify branches the build should be "- + "running on. Use space to separate multipe branches, and use * or ? for wildcard match")+ @Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "+ + "applicable for this trigger. Use * or ? for wildcard match")@BranchPatterns- @NameOfEmptyValue("No restriction")+ @NameOfEmptyValue("All")public String getBranches() {return branches;}@@ -44,31 +41,11 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {this.branches = branches;}- @Editable(order=300, name="Restricted Tags", description="Optionally specify tags the build should be running on. "- + "Use space to separate multipe tags, and use * or ? for wildcard match")- @TagPatterns- @NameOfEmptyValue("No restriction")- public String getTags() {- return tags;- }-- public void setTags(String tags) {- this.tags = tags;- }-public Usage onDeleteBranch(String branchName) {Usage usage = new Usage();PatternSet patternSet = PatternSet.fromString(getBranches());if (patternSet.getIncludes().contains(branchName) || patternSet.getExcludes().contains(branchName))- usage.add("restricted branches");- return usage;- }-- public Usage onDeleteTag(String tagName) {- Usage usage = new Usage();- PatternSet patternSet = PatternSet.fromString(getTags());- if (patternSet.getIncludes().contains(tagName) || patternSet.getExcludes().contains(tagName))- usage.add("restricted tags");+ usage.add("applicable branches");return usage;}diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.javaindex 1896038854..d1cf77bf10 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java@@ -24,7 +24,6 @@ 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.editable.annotation.ProjectPatterns;-import io.onedev.server.web.editable.annotation.TagPatterns;@Editablepublic abstract class JobExecutor implements Serializable {@@ -41,8 +40,6 @@ public abstract class JobExecutor implements Serializable {private String branches;- private String tags;-private String jobs;private String environments;@@ -68,11 +65,10 @@ public abstract class JobExecutor implements Serializable {this.name = name;}- @Editable(order=10000, name="Restricted Projects", group="Job Restrictions",- description="Optionally specify projects applicable for this executor. Use space to "- + "separate multiple projects, and use * or ? for wildcard match")+ @Editable(order=10000, name="Applicable Projects", group="Job Applicability",+ description="Optionally specify space-separated projects applicable for this executor. Use * or ? for wildcard match")@ProjectPatterns- @NameOfEmptyValue("No restrictions")+ @NameOfEmptyValue("All")public String getProjects() {return projects;}@@ -81,11 +77,10 @@ public abstract class JobExecutor implements Serializable {this.projects = projects;}- @Editable(order=10100, name="Restricted Branches", group="Job Restrictions",- description="Optionally specify branches the job should be running on in order to use this executor. "- + "Use space to separate multiple projects, and use * or ? for wildcard match")+ @Editable(order=10100, name="Applicable Branches", group="Job Applicability",+ description="Optionally specify space-separated branches applicable for this executor. Use * or ? for wildcard match")@BranchPatterns- @NameOfEmptyValue("No restrictions")+ @NameOfEmptyValue("All")public String getBranches() {return branches;}@@ -94,24 +89,10 @@ public abstract class JobExecutor implements Serializable {this.branches = branches;}- @Editable(order=10110, name="Restricted Tags", group="Job Restrictions",- description="Optionally specify tags the job should be running on in order to use this executor. "- + "Use space to separate multiple projects, and use * or ? for wildcard match")- @TagPatterns- @NameOfEmptyValue("No restrictions")- public String getTags() {- return tags;- }-- public void setTags(String tags) {- this.tags = tags;- }-- @Editable(order=10200, name="Restricted Jobs", group="Job Restrictions",- description="Optionally specify jobs applicable for this executor. Use space to separate "- + "multiple jobs, and use * or ? for wildcard match")+ @Editable(order=10200, name="Applicable Jobs", group="Job Applicability",+ description="Optionally specify space-separated jobs applicable for this executor. Use * or ? for wildcard match")@Patterns- @NameOfEmptyValue("No restrictions")+ @NameOfEmptyValue("All")public String getJobs() {return jobs;}@@ -120,11 +101,10 @@ public abstract class JobExecutor implements Serializable {this.jobs = jobs;}- @Editable(order=10300, name="Restricted Environments", group="Job Restrictions",- description="Optionally specify job environments applicable for this executor. Use space to "- + "separate multiple environments, and use * or ? for wildcard match")+ @Editable(order=10300, name="Applicable Environments", group="Job Applicability",+ description="Optionally specify space-separated job environments applicable for this executor. Use * or ? for wildcard match")@Patterns- @NameOfEmptyValue("No restrictions")+ @NameOfEmptyValue("All")public String getEnvironments() {return environments;}@@ -156,21 +136,20 @@ public abstract class JobExecutor implements Serializable {&& (getProjects() == null || PatternSet.fromString(getProjects()).matches(matcher, project.getName()))&& (getJobs() == null || PatternSet.fromString(getJobs()).matches(matcher, jobName))&& (getEnvironments() == null || PatternSet.fromString(getEnvironments()).matches(matcher, environment))- && (getBranches() == null || project.isCommitOnBranches(commitId, getBranches())- && (getTags() == null || project.isCommitOnTags(commitId, getTags())));+ && (getBranches() == null || project.isCommitOnBranches(commitId, getBranches()));}- public Usage getProjectUsage(String projectName) {+ public Usage onDeleteProject(String projectName) {Usage usage = new Usage();if (getProjects() != null) {PatternSet patternSet = PatternSet.fromString(getProjects());if (patternSet.getIncludes().contains(projectName) || patternSet.getExcludes().contains(projectName))- usage.add("restricted projects");+ usage.add("applicable projects");}return usage.prefix(getName()).prefix("job executor '" + getName() + "'");}- public void onProjectRenamed(String oldName, String newName) {+ public void onRenameProject(String oldName, String newName) {PatternSet patternSet = PatternSet.fromString(getProjects());if (patternSet.getIncludes().remove(oldName))patternSet.getIncludes().add(newName);diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex c503e91489..f4b592a12d 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -347,7 +347,7 @@ public class BeanEditor extends ValueEditor<Serializable> {@Overridepublic void component(PropertyEditor<Serializable> object, IVisit<PropertyEditor<Serializable>> visit) {- if (!object.getDescriptor().isPropertyExcluded())+ if (!object.getDescriptor().isPropertyExcluded())object.getDescriptor().setPropertyValue(bean, object.getConvertedInput());visit.dontGoDeeper();}diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 1c808de23e..46094585fb 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -38,13 +38,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- List<String> selections;- if (getModelObject() != null)- selections = getModelObject();- else- selections = new ArrayList<>();-- input = new StringMultiChoice("input", Model.of(selections), new LoadableDetachableModel<Map<String, String>>() {+ IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {@Overrideprotected Map<String, String> load() {@@ -73,7 +67,23 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {return choices;}- }) {+ };++ input = new StringMultiChoice("input", new LoadableDetachableModel<Collection<String>>() {++ @Override+ protected Collection<String> load() {+ List<String> selections;+ if (getModelObject() != null) {+ selections = MultiChoiceEditor.this.getModelObject();+ selections.retainAll(choicesModel.getObject().keySet());+ } else {+ selections = new ArrayList<>();+ }+ return selections;+ }++ }, choicesModel) {@Overrideprotected void onInitialize() {diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex d18f6a9064..7fcd05f5ff 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -36,7 +36,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- input = new StringSingleChoice("input", Model.of(getModelObject()), new LoadableDetachableModel<Map<String, String>>() {+ IModel<Map<String, String>> choicesModel = new LoadableDetachableModel<Map<String, String>>() {@Overrideprotected Map<String, String> load() {@@ -64,7 +64,20 @@ public class SingleChoiceEditor extends PropertyEditor<String> {return choices;}- }) {+ };++ input = new StringSingleChoice("input", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ String selection = SingleChoiceEditor.this.getModelObject();+ if (choicesModel.getObject().containsKey(selection))+ return selection;+ else+ return null;+ }++ }, choicesModel) {@Overrideprotected void onInitialize() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.javaindex 85ff2290a0..63d6b91198 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java@@ -49,6 +49,10 @@ abstract class NewBoardPanel extends Panel {.addError("This name has already been used by another issue board in the project");}if (!editor.hasErrors(true)){+ board.getColumns().clear();+ for (String column: board.getEditColumns())+ board.getColumns().add(column.equals(BoardSpec.NULL_COLUMN)?null:column);+boards.add(board);getProject().getIssueSetting().setBoardSpecs(boards);OneDev.getInstance(ProjectManager.class).save(getProject());