The Unified and Autonomous Development Platform
fix: Different field types for issue fields in REST API (OD-1999)
Robin Shena6e364c799f6
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.javaindex 8a896ed714..9f7d8f4d9e 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java@@ -79,15 +79,19 @@ public class IssueResource {Issue issue = issueManager.load(issueId);if (!SecurityUtils.canAccessIssue(issue))throw new UnauthorizedException();-++ var issueSetting = settingManager.getIssueSetting();Map<String, Serializable> fields = new HashMap<>();for (var field: issue.getFieldInputs().values()) {- if (field.getValues().isEmpty())- fields.put(field.getName(), null);- else if (field.getValues().size() == 1)- fields.put(field.getName(), field.getValues().iterator().next());- else- fields.put(field.getName(), (Serializable) field.getValues());+ var fieldSpec = issueSetting.getFieldSpec(field.getName());+ if (fieldSpec != null) {+ if (field.getValues().isEmpty())+ fields.put(field.getName(), null);+ else if (fieldSpec.isAllowMultiple())+ fields.put(field.getName(), (Serializable) field.getValues());+ else+ fields.put(field.getName(), field.getValues().iterator().next());+ }}return fields;}