The Unified and Autonomous Development Platform
Adjust default issue workflow
Robin Shenfec2e87ed8f1
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 03ed1dbf96..a968a510fd 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -898,7 +898,7 @@ public class Project extends AbstractEntity {savedIssueQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));savedIssueQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));savedIssueQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));- savedIssueQueries.add(new NamedIssueQuery("High Priority", "\"Priority\" is \"High\""));+ savedIssueQueries.add(new NamedIssueQuery("Critical outstanding", "outstanding and \"Priority\" is \"Critical\""));savedIssueQueries.add(new NamedIssueQuery("Unassigned outstanding", "outstanding and \"Assignee\" is empty"));savedIssueQueries.add(new NamedIssueQuery("Closed", "closed"));savedIssueQueries.add(new NamedIssueQuery("All", "all"));@@ -1030,14 +1030,13 @@ public class Project extends AbstractEntity {issueListFields.add(IssueConstants.FIELD_NUMBER);issueListFields.add(IssueConstants.FIELD_STATE);issueListFields.add(IssueConstants.FIELD_TITLE);- issueListFields.add("Type");issueListFields.add("Priority");issueListFields.add(IssueConstants.FIELD_SUBMITTER);issueListFields.add("Assignee");}return issueListFields;}-+public void setIssueListFields(ArrayList<String> issueListFields) {this.issueListFields = issueListFields;}@@ -1151,7 +1150,7 @@ public class Project extends AbstractEntity {board.setName(IssueConstants.FIELD_STATE);board.setIdentifyField(IssueConstants.FIELD_STATE);board.setColumns(Lists.newArrayList("Open", "Assigned", "Closed"));- board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee"));+ board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Priority", "Assignee"));issueBoards.add(board);}return issueBoards;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.javaindex f125c11efd..18dd8a7ba5 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java@@ -51,61 +51,36 @@ public class IssueWorkflow implements Serializable {private transient Map<String, InputSpec> fieldSpecMap;public IssueWorkflow() {- ChoiceInput type = new ChoiceInput();- type.setName("Type");- SpecifiedChoices specifiedChoices = new SpecifiedChoices();-- List<Choice> choices = new ArrayList<>();- Choice newFeature = new Choice();- newFeature.setValue("New Feature");- choices.add(newFeature);-- Choice improvement = new Choice();- improvement.setValue("Improvement");- choices.add(improvement);-- Choice bug = new Choice();- bug.setValue("Bug");- choices.add(bug);-- Choice task = new Choice();- task.setValue("Task");- choices.add(task);-- specifiedChoices.setChoices(choices);- type.setChoiceProvider(specifiedChoices);-- SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();- specifiedDefaultValue.setValue("Bug");- type.setDefaultValueProvider(specifiedDefaultValue);-- fieldSpecs.add(type);-ChoiceInput priority = new ChoiceInput();priority.setName("Priority");- specifiedChoices = new SpecifiedChoices();+ SpecifiedChoices specifiedChoices = new SpecifiedChoices();- choices = new ArrayList<>();+ List<Choice> choices = new ArrayList<>();- Choice low = new Choice();- low.setValue("Low");- low.setColor("#d9ead3");- choices.add(low);+ Choice minor = new Choice();+ minor.setValue("Minor");+ minor.setColor("#CCCCCC");+ choices.add(minor);Choice normal = new Choice();normal.setValue("Normal");- normal.setColor("#f4cccc");+ normal.setColor("#009a1a");choices.add(normal);- Choice high = new Choice();- high.setValue("High");- high.setColor("#cc0000");- choices.add(high);+ Choice major = new Choice();+ major.setValue("Major");+ major.setColor("#ff9900");+ choices.add(major);++ Choice critical = new Choice();+ critical.setValue("Critical");+ critical.setColor("#cc0000");+ choices.add(critical);specifiedChoices.setChoices(choices);priority.setChoiceProvider(specifiedChoices);- specifiedDefaultValue = new SpecifiedDefaultValue();+ SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();specifiedDefaultValue.setValue("Normal");priority.setDefaultValueProvider(specifiedDefaultValue);@@ -166,7 +141,7 @@ public class IssueWorkflow implements Serializable {StateSpec assigned = new StateSpec();assigned.setName("Assigned");assigned.setCategory(StateSpec.Category.OPEN);- assigned.setColor("#9900ff");+ assigned.setColor("#6fa8dc");stateSpecs.add(assigned);