Skip to content

The Unified and Autonomous Development Platform

fix issue #133: Issue workflow reconciliation is not complete after workflow change

Robin Shena723971d3b16
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 8fe57e0464..1c9a34c493 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
@@ -35,6 +35,7 @@ import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTri
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.usage.Usage;
+import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
@@ -359,6 +360,15 @@ public class GlobalIssueSetting implements Serializable {
public Collection<String> getUndefinedFields() {
Collection<String> undefinedFields = new HashSet<>();
+ for (String fieldName: listFields) {
+ if (!fieldName.equals(Issue.FIELD_STATE) && getFieldSpec(fieldName) == null)
+ undefinedFields.add(fieldName);
+ }
+ for (String fieldName: promptFieldsUponIssueOpen) {
+ if (getFieldSpec(fieldName) == null)
+ undefinedFields.add(fieldName);
+ }
+
for (TransitionSpec transition: getTransitionSpecs())
undefinedFields.addAll(transition.getUndefinedFields());
for (FieldSpec field: getFieldSpecs())
@@ -416,6 +426,17 @@ public class GlobalIssueSetting implements Serializable {
}
public Collection<String> fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
+ ReconcileUtils.renameItem(listFields, entry.getKey(), entry.getValue().getNewField());
+ if (promptFieldsUponIssueOpen.remove(entry.getKey()))
+ promptFieldsUponIssueOpen.add(entry.getValue().getNewField());
+ } else {
+ listFields.remove(entry.getKey());
+ promptFieldsUponIssueOpen.remove(entry.getKey());
+ }
+ }
+
for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {
if (it.next().fixUndefinedFields(resolutions))
it.remove();
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index 6006cccf83..154a6435e3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -329,13 +329,7 @@ public class BoardSpec implements Serializable {
if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
if (getIdentifyField().equals(entry.getKey()))
setIdentifyField(resolution.getNewField());
- int index = getDisplayFields().indexOf(entry.getKey());
- if (index != -1) {
- if (getDisplayFields().contains(resolution.getNewField()))
- getDisplayFields().remove(index);
- else
- getDisplayFields().set(index, resolution.getNewField());
- }
+ ReconcileUtils.renameItem(getDisplayFields(), entry.getKey(), entry.getValue().getNewField());
} else {
getDisplayFields().remove(entry.getKey());
if (getIdentifyField().equals(entry.getKey()))
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
index f7512a041f..0d61f3d725 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
@@ -13,6 +13,7 @@ import javax.annotation.Nullable;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
@@ -128,7 +129,7 @@ public class ProjectIssueSetting implements Serializable {
Set<String> undefinedFields = new HashSet<>();
if (listFields != null) {
for (String fieldName: listFields) {
- if (getGlobalSetting().getFieldSpec(fieldName) == null)
+ if (!fieldName.equals(Issue.FIELD_STATE) && getGlobalSetting().getFieldSpec(fieldName) == null)
undefinedFields.add(fieldName);
}
}