The Unified and Autonomous Development Platform
fix issue #33: Issue reconcile always report to resolve a field with empty value
Robin Shenedd5c415391c
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex c9d7262f4e..f51853906a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -482,7 +482,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsString fieldName = (String) row[0];String fieldValue = (String) row[1];SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(fieldName));- if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(fieldValue)) {+ if (specifiedChoices != null && fieldValue != null+ && !specifiedChoices.getChoiceValues().contains(fieldValue)) {undefinedFieldValues.add(new UndefinedFieldValue(fieldName, fieldValue));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 351621d03a..05045892a0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -191,7 +191,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {add(label);add(AttributeAppender.append("class", "undefined"));} else {- add(new WebMarkupContainer("content").setVisible(false));+ add(new WebMarkupContainer("content"));+ setVisible(false);}}