The Unified and Autonomous Development Platform
Add default issue links
Robin Shen00010ab3bb17
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex b87c4b2a4a..1b78b86e61 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -112,9 +112,14 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMchildCreator.setName("Child Creator");childCreator.setCreateChildren(true);childCreator.setCodePrivilege(CodePrivilege.READ);- ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();- allfieldsExcept.getExcludeFields().add("Assignees");- childCreator.setEditableIssueFields(allfieldsExcept);++ boolean hasAssigneesField = settingManager.getIssueSetting().getFieldSpec("Assignees") != null;++ if (hasAssigneesField) {+ ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();+ allfieldsExcept.getExcludeFields().add("Assignees");+ childCreator.setEditableIssueFields(allfieldsExcept);+ }JobPrivilege jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -138,9 +143,12 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMRole codeReader = new Role();codeReader.setName("Code Reader");codeReader.setCodePrivilege(CodePrivilege.READ);- allfieldsExcept = new ExcludeIssueFields();- allfieldsExcept.getExcludeFields().add("Assignees");- codeReader.setEditableIssueFields(allfieldsExcept);++ if (hasAssigneesField) {+ ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();+ allfieldsExcept.getExcludeFields().add("Assignees");+ codeReader.setEditableIssueFields(allfieldsExcept);+ }jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");@@ -151,9 +159,12 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMRole issueReporter = new Role();issueReporter.setName("Issue Reporter");issueReporter.setCodePrivilege(CodePrivilege.NONE);- allfieldsExcept = new ExcludeIssueFields();- allfieldsExcept.getExcludeFields().add("Assignees");- issueReporter.setEditableIssueFields(allfieldsExcept);++ if (hasAssigneesField) {+ ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();+ allfieldsExcept.getExcludeFields().add("Assignees");+ issueReporter.setEditableIssueFields(allfieldsExcept);+ }jobPrivilege = new JobPrivilege();jobPrivilege.setJobNames("*");diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 6a98d83313..d638c2e204 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -30,10 +30,12 @@ import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.LinkSpecManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.system.SystemStarting;+import io.onedev.server.model.LinkSpec;import io.onedev.server.model.Role;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;@@ -51,6 +53,7 @@ import io.onedev.server.model.support.administration.ServiceDeskSetting;import io.onedev.server.model.support.administration.SshSetting;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;+import io.onedev.server.model.support.issue.LinkSpecOpposite;import io.onedev.server.notification.MailManager;import io.onedev.server.persistence.PersistManager;import io.onedev.server.persistence.annotation.Sessional;@@ -80,13 +83,16 @@ public class DefaultDataManager implements DataManager, Serializable {private final RoleManager roleManager;+ private final LinkSpecManager linkSpecManager;+private String backupTaskId;@Injectpublic DefaultDataManager(UserManager userManager,SettingManager settingManager, PersistManager persistManager,MailManager mailManager, Validator validator, TaskScheduler taskScheduler,- PasswordService passwordService, RoleManager roleManager) {+ PasswordService passwordService, RoleManager roleManager,+ LinkSpecManager linkSpecManager) {this.userManager = userManager;this.settingManager = settingManager;this.validator = validator;@@ -95,6 +101,7 @@ public class DefaultDataManager implements DataManager, Serializable {this.mailManager = mailManager;this.passwordService = passwordService;this.roleManager = roleManager;+ this.linkSpecManager = linkSpecManager;}@SuppressWarnings({"serial"})@@ -204,6 +211,23 @@ public class DefaultDataManager implements DataManager, Serializable {}setting = settingManager.getSetting(Key.ISSUE);if (setting == null) {+ LinkSpec link = new LinkSpec();+ link.setName("Child Issue");+ link.setMultiple(true);+ link.setOpposite(new LinkSpecOpposite());+ link.getOpposite().setName("Parent Issue");+ link.setOrder(1);+ linkSpecManager.save(link);++ link = new LinkSpec();+ link.setName("Blocked By");+ link.setMultiple(true);+ link.setOpposite(new LinkSpecOpposite());+ link.getOpposite().setName("Blocking");+ link.getOpposite().setMultiple(true);+ link.setOrder(2);+ linkSpecManager.save(link);+settingManager.saveIssueSetting(new GlobalIssueSetting());}setting = settingManager.getSetting(Key.PERFORMANCE);diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 6f41c73b71..64da6279b8 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -228,6 +228,7 @@ public class Role extends AbstractEntity implements Permission {}@Editable(order=625, description="Optionally specify issue links allowed to edit")+ @ShowCondition("isManageIssuesDisabled")@ChoiceProvider("getIssueLinkChoices")@NameOfEmptyValue("None")public List<String> getEditableIssueLinks() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 854648ed5e..19a04936db 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -36,6 +36,7 @@ import io.onedev.server.model.support.issue.field.spec.UserChoiceField;import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;+import io.onedev.server.model.support.issue.transitiontrigger.StateTransitionTrigger;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.match.Matcher;import io.onedev.server.util.match.PathMatcher;@@ -190,6 +191,7 @@ public class GlobalIssueSetting implements Serializable {PressButtonTrigger pressButton = new PressButtonTrigger();pressButton.setButtonLabel("Close");pressButton.setAuthorizedRoles(Lists.newArrayList("Code Writer", "Code Reader"));+ pressButton.setIssueQuery("not(any \"Blocked By\" matching(\"State\" is \"Open\")) and not(any \"Child Issue\" matching(\"State\" is \"Open\"))");transition.setTrigger(pressButton);transitionSpecs.add(transition);@@ -213,6 +215,16 @@ public class GlobalIssueSetting implements Serializable {transitionSpecs.add(transition);+ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Open"));+ transition.setToState("Closed");+ StateTransitionTrigger stateTransition = new StateTransitionTrigger();+ stateTransition.setStates(Lists.newArrayList("Closed"));+ stateTransition.setIssueQuery("any \"Child Issue\" matching(current issue) and all \"Child Issue\" matching(\"State\" is \"Closed\")");+ transition.setTrigger(stateTransition);++ transitionSpecs.add(transition);+transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Open", "Closed"));transition.setToState("Released");@@ -232,6 +244,16 @@ public class GlobalIssueSetting implements Serializable {pressButton.setAuthorizedRoles(Lists.newArrayList("Code Writer", "Code Reader"));transition.setTrigger(pressButton);+ transitionSpecs.add(transition);++ transition = new TransitionSpec();+ transition.setFromStates(Lists.newArrayList("Closed", "Released"));+ transition.setToState("Open");+ stateTransition = new StateTransitionTrigger();+ stateTransition.setStates(Lists.newArrayList("Open"));+ stateTransition.setIssueQuery("any \"Child Issue\" matching(current issue) or any \"Blocked By\" matching(current issue)");+ transition.setTrigger(stateTransition);+transitionSpecs.add(transition);BoardSpec board = new BoardSpec();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkAddData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkAddData.javaindex 189811ce2a..f66949b2ca 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkAddData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkAddData.java@@ -23,7 +23,7 @@ public class IssueLinkAddData extends IssueChangeData {@Overridepublic String getActivity() {- return "added '" + linkName + "': " + issueSummary;+ return "added \"" + linkName + "\" (" + issueSummary + ")";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkChangeData.javaindex 52e7433619..b0ef7b1e89 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkChangeData.java@@ -29,7 +29,7 @@ public class IssueLinkChangeData extends IssueChangeData {@Overridepublic String getActivity() {- return "changed '" + linkName + "'";+ return "changed \"" + linkName + "\"";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkRemoveData.javaindex 7ab16eb80f..ac5b76c1d5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkRemoveData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkRemoveData.java@@ -23,7 +23,7 @@ public class IssueLinkRemoveData extends IssueChangeData {@Overridepublic String getActivity() {- return "removed '" + linkName + "': " + issueSummary;+ return "removed \"" + linkName + "\" (" + issueSummary + ")";}@Overridediff --git a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.javaindex 4a7346f352..ccd1f42d9e 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/EditIssueLink.java@@ -1,5 +1,7 @@package io.onedev.server.security.permission;+import javax.annotation.Nullable;+import org.apache.shiro.authz.Permission;import io.onedev.server.model.LinkSpec;@@ -8,7 +10,7 @@ public class EditIssueLink implements Permission {private final LinkSpec link;- public EditIssueLink(LinkSpec link) {+ public EditIssueLink(@Nullable LinkSpec link) {this.link = link;}@@ -16,7 +18,7 @@ public class EditIssueLink implements Permission {public boolean implies(Permission p) {if (p instanceof EditIssueLink) {EditIssueLink editIssueLink = (EditIssueLink) p;- return link.equals(editIssueLink.link);+ return link == null || link.equals(editIssueLink.link);} else {return new AccessProject().implies(p);}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.javaindex 38a5d93e29..80c0bc13d8 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageIssues.java@@ -6,7 +6,10 @@ public class ManageIssues implements Permission {@Overridepublic boolean implies(Permission p) {- return p instanceof ManageIssues || new EditIssueField(null).implies(p) || new ScheduleIssues().implies(p);+ return p instanceof ManageIssues+ || new EditIssueField(null).implies(p)+ || new EditIssueLink(null).implies(p)+ || new ScheduleIssues().implies(p);}}