The Unified and Autonomous Development Platform
Update field name used in issue query of state transition trigger upon issue field renaming
Robin Shene5abd8e35439
diff --git a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.javaindex 6680f6d31c..eb22a30926 100644--- a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java@@ -135,6 +135,18 @@ public class BoardSpec implements Serializable {public void setDisplayFields(List<String> displayFields) {this.displayFields = displayFields;}++ public void populateEditColumns() {+ getEditColumns().clear();+ for (String column: getColumns())+ getEditColumns().add(column!=null?column:BoardSpec.NULL_COLUMN);+ }++ public void populateColumns() {+ getColumns().clear();+ for (String column: getEditColumns())+ getColumns().add(column.equals(BoardSpec.NULL_COLUMN)?null:column);+ }@SuppressWarnings("unused")private static List<String> getIdentifyFieldChoices() {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex bb0abb614f..235cb41952 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -152,9 +152,9 @@ public class IssueQuery extends EntityQuery<Issue> {checkField(fieldName, operator, withCurrentUserCriteria, withCurrentBuildCriteria,withCurrentPullRequestCriteria, withCurrentCommitCriteria);}- if (fieldName.equals(Issue.FIELD_MILESTONE))+ if (fieldName.equals(Issue.FIELD_MILESTONE)) {return new MilestoneIsEmptyCriteria();- else {+ } else {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);return new FieldOperatorCriteria(fieldName, operator, fieldSpec.isAllowMultiple());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.javaindex e8da1809c3..e0be2db951 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java@@ -52,9 +52,7 @@ public abstract class BoardEditPanel extends Panel {elseboard = new BoardSpec();- board.getEditColumns().clear();- for (String column: board.getColumns())- board.getEditColumns().add(column!=null?column:BoardSpec.NULL_COLUMN);+ board.populateEditColumns();BeanEditor editor = BeanContext.edit("editor", board);@@ -77,9 +75,7 @@ public abstract class BoardEditPanel extends Panel {"This name has already been used by another board");}if (editor.isValid()) {- board.getColumns().clear();- for (String column: board.getEditColumns())- board.getColumns().add(column.equals(BoardSpec.NULL_COLUMN)?null:column);+ board.populateColumns();if (boardIndex != -1) {boards.set(boardIndex, board);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.javaindex 2a17c879d4..a161f47e93 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java@@ -226,6 +226,9 @@ public class DefaultBoardListPage extends IssueSettingPage {protected Component newBody(String id) {SideFloating sideFloating = this;Fragment fragment = new Fragment(id, "viewBoardFrag", DefaultBoardListPage.this);++ board.populateEditColumns();+fragment.add(BeanContext.view("viewer", getBoard(), Sets.newHashSet("name"), true));fragment.add(new ModalLink("edit") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.javaindex 130899da76..64e1b0f41e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java@@ -103,14 +103,14 @@ abstract class FieldEditPanel extends Panel implements InputContext {boolean displayInList;if (fieldIndex != -1) {FieldSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);- getSetting().getFieldSpecs().set(fieldIndex, field);- getSetting().getDefaultPromptFieldsUponIssueOpen().remove(oldField.getName());- displayInList = getSetting().getListFields().remove(oldField.getName());if (!field.getName().equals(oldField.getName())) {getSetting().onRenameField(oldField.getName(), field.getName());OneDev.getInstance(RoleManager.class).onRenameIssueField(oldField.getName(), field.getName());getSetting().setReconciled(false);}+ getSetting().getFieldSpecs().set(fieldIndex, field);+ getSetting().getDefaultPromptFieldsUponIssueOpen().remove(oldField.getName());+ displayInList = getSetting().getListFields().remove(oldField.getName());if (oldField instanceof ChoiceField && field instanceof ChoiceField) {ChoiceField oldChoiceInput = (ChoiceField) oldField;ChoiceField choiceInput = (ChoiceField) field;diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.javaindex 1d1f2b4c01..b6d00cf67f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java@@ -87,11 +87,11 @@ abstract class StateEditPanel extends Panel {if (editor.isValid()) {if (stateIndex != -1) {StateSpec oldState = getSetting().getStateSpecs().get(stateIndex);- getSetting().getStateSpecs().set(stateIndex, state);if (!state.getName().equals(oldState.getName())) {getSetting().onRenameState(oldState.getName(), state.getName());getSetting().setReconciled(false);}+ getSetting().getStateSpecs().set(stateIndex, state);} else {getSetting().getStateSpecs().add(state);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.javaindex 92941cfa5f..87cea7ef78 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java@@ -50,9 +50,7 @@ abstract class NewBoardPanel extends Panel {"This name has already been used by another issue board in the project");}if (editor.isValid()){- board.getColumns().clear();- for (String column: board.getEditColumns())- board.getColumns().add(column.equals(BoardSpec.NULL_COLUMN)?null:column);+ board.populateColumns();boards.add(board);getProject().getIssueSetting().setBoardSpecs(boards);