The Unified and Autonomous Development Platform
Fix the issue that issue boards can not be displayed
Robin Shendca9262dd9e5
diff --git a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.javaindex 5de3383963..7602705a32 100644--- a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java+++ b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java@@ -218,7 +218,7 @@ public class GlobalIssueSetting implements Serializable {BoardSpec board = new BoardSpec();board.setName(IssueConstants.FIELD_STATE);board.setIdentifyField(IssueConstants.FIELD_STATE);- board.setColumns(Lists.newArrayList("Open", "Assigned", "Closed"));+ board.setColumns(Lists.newArrayList("Open", "Closed"));board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee", "Resolution", "Duplicate With"));defaultBoardSpecs.add(board);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 9b749a2339..b903ae8424 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -41,6 +41,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.IssueSetting;+import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.support.setting.GlobalIssueSetting;@@ -223,7 +224,9 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (getColumn() != null) {title = HtmlEscape.escapeHtml5(getColumn());if (identifyField.equals(IssueConstants.FIELD_STATE)) {- color = getIssueSetting().getStateSpec(getColumn()).getColor();+ StateSpec stateSpec = getIssueSetting().getStateSpec(getColumn());+ if (stateSpec != null)+ color = stateSpec.getColor();} else {InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);if (fieldSpec instanceof ChoiceInput) {