Skip to content

The Unified and Autonomous Development Platform

chore: Make default issue assignee field able to accept multiple users

Robin Shena91580d5f1e4
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.java
index 5640e0fb5e..50b2819b1d 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
@@ -159,7 +159,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
@Transactional
public void setupDefaults() {
- boolean hasAssigneeField = settingManager.getIssueSetting().getFieldSpec("Assignee") != null;
+ boolean hasAssigneesField = settingManager.getIssueSetting().getFieldSpec("Assignees") != null;
Role codeWriter = new Role();
codeWriter.setName("Code Writer");
@@ -182,9 +182,9 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
codeReader.setPackPrivilege(PackPrivilege.READ);
codeReader.setAccessTimeTracking(false);
- if (hasAssigneeField) {
+ if (hasAssigneesField) {
ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();
- allfieldsExcept.getExcludeFields().add("Assignee");
+ allfieldsExcept.getExcludeFields().add("Assignees");
codeReader.setEditableIssueFields(allfieldsExcept);
}
@@ -214,9 +214,9 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
packReader.setPackPrivilege(PackPrivilege.READ);
packReader.setAccessTimeTracking(false);
- if (hasAssigneeField) {
+ if (hasAssigneesField) {
ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();
- allfieldsExcept.getExcludeFields().add("Assignee");
+ allfieldsExcept.getExcludeFields().add("Assignees");
packReader.setEditableIssueFields(allfieldsExcept);
}
@@ -243,9 +243,9 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
issueReporter.setCodePrivilege(CodePrivilege.NONE);
issueReporter.setAccessTimeTracking(false);
- if (hasAssigneeField) {
+ if (hasAssigneesField) {
ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();
- allfieldsExcept.getExcludeFields().add("Assignee");
+ allfieldsExcept.getExcludeFields().add("Assignees");
issueReporter.setEditableIssueFields(allfieldsExcept);
}
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.java
index 0e7a062c89..da78a50cc5 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
@@ -162,12 +162,13 @@ public class GlobalIssueSetting implements Serializable {
fieldSpecs.add(priority);
- UserChoiceField assignee = new UserChoiceField();
- assignee.setAllowEmpty(true);
- assignee.setNameOfEmptyValue("Not assigned");
- assignee.setName("Assignee");
+ UserChoiceField assignees = new UserChoiceField();
+ assignees.setAllowMultiple(true);
+ assignees.setAllowEmpty(true);
+ assignees.setNameOfEmptyValue("Not assigned");
+ assignees.setName("Assignees");
- fieldSpecs.add(assignee);
+ fieldSpecs.add(assignees);
StateSpec open = new StateSpec();
open.setName("Open");
@@ -184,7 +185,7 @@ public class GlobalIssueSetting implements Serializable {
var manualSpec = new ManualSpec();
manualSpec.setFromStates(Lists.newArrayList("Open"));
manualSpec.setToStates(Lists.newArrayList("Closed"));
- manualSpec.setAuthorizedRoles(Lists.newArrayList("Code Writer", ManualSpec.ROLE_SUBMITTER, "{Assignee}"));
+ manualSpec.setAuthorizedRoles(Lists.newArrayList("Code Writer", ManualSpec.ROLE_SUBMITTER, "{Assignees}"));
manualSpec.setIssueQuery("not(any \"Blocked By\" matching(\"State\" is \"Open\")) and not(any \"Sub Issues\" matching(\"State\" is \"Open\"))");
transitionSpecs.add(manualSpec);
@@ -228,14 +229,14 @@ public class GlobalIssueSetting implements Serializable {
board.setName(Issue.NAME_STATE);
board.setIdentifyField(Issue.NAME_STATE);
board.setColumns(Lists.newArrayList("Open", "Closed"));
- board.setDisplayFields(Lists.newArrayList(Issue.NAME_STATE, "Type", "Priority", "Assignee", IssueSchedule.NAME_ITERATION));
+ board.setDisplayFields(Lists.newArrayList(Issue.NAME_STATE, "Type", "Priority", "Assignees", IssueSchedule.NAME_ITERATION));
board.setDisplayLinks(Lists.newArrayList("Sub Issues", "Parent Issue", "Blocked By", "Blocks", "Related"));
boardSpecs.add(board);
listFields.add(Issue.NAME_STATE);
listFields.add("Type");
listFields.add("Priority");
- listFields.add("Assignee");
+ listFields.add("Assignees");
listFields.add(IssueSchedule.NAME_ITERATION);
listLinks.add("Sub Issues");
@@ -245,16 +246,16 @@ public class GlobalIssueSetting implements Serializable {
listLinks.add("Related");
namedQueries.add(new NamedIssueQuery("Open", "\"State\" is \"Open\""));
- namedQueries.add(new NamedIssueQuery("Assigned to me & Open", "\"Assignee\" is me and \"State\" is \"Open\""));
+ namedQueries.add(new NamedIssueQuery("Assigned to me & Open", "\"Assignees\" is me and \"State\" is \"Open\""));
namedQueries.add(new NamedIssueQuery("Submitted by me & Open", "submitted by me and \"State\" is \"Open\""));
- namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));
+ namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignees\" is me"));
namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));
namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));
namedQueries.add(new NamedIssueQuery("Mentioned me", "mentioned me"));
namedQueries.add(new NamedIssueQuery("Blocked issues", "any \"Blocked By\" matching(\"State\" is \"Open\") or any \"Sub Issues\" matching(\"State\" is \"Open\")"));
namedQueries.add(new NamedIssueQuery("Has activity recently", "\"Last Activity Date\" is since \"last week\""));
namedQueries.add(new NamedIssueQuery("Open & Critical", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));
- namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignee\" is empty"));
+ namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignees\" is empty"));
namedQueries.add(new NamedIssueQuery("Open & Unscheduled", "\"State\" is \"Open\" and \"Iteration\" is empty"));
namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));
namedQueries.add(new NamedIssueQuery("All", null));