The Unified and Autonomous Development Platform
Fix issue #1113 - Custom field of type 'text' with multiple lines allowed should respect newlines when rendered in UI
Robin Shen3f50a7ff903e
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 b5922bb824..5224d56f7c 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@@ -8,6 +8,8 @@ import java.util.Map;import javax.annotation.Nullable;+import io.onedev.server.model.support.issue.field.spec.TextField;+import io.onedev.server.web.component.MultilineLabel;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -317,13 +319,15 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, ProvalueContainer.add(new Label("value", value));}} else {- Label label;- if (getField().getType().equals(ParamSpec.SECRET))+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());+ Component label;+ if (getField().getType().equals(FieldSpec.SECRET))label = new Label("value", SecretInput.MASK);+ else if (fieldSpec instanceof TextField && ((TextField) fieldSpec).isMultiline())+ label = new MultilineLabel("value", value);elselabel = new Label("value", value);- FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());if (fieldSpec != null && fieldSpec instanceof ChoiceField) {ChoiceProvider choiceProvider = ((ChoiceField)fieldSpec).getChoiceProvider();ComponentContext.push(new ComponentContext(this));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.htmlindex 25522a0ccc..80f44aa476 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html@@ -6,7 +6,7 @@<a wicket:id="links" class="link-info font-weight-normal link d-inline-flex align-items-center mr-2"><span wicket:id="label"></span><wicket:svg href="arrow" class="icon icon-sm"/></a><a wicket:id="showDetail" title="Click to show issue details" class="show-detail"><wicket:svg href="ellipsis" class="icon"/></a></div>- <div class="secondary d-flex flex-wrap align-items-center mb-n2">+ <div class="secondary d-flex flex-wrap mb-n2"><div wicket:id="transit" class="state"><span wicket:id="state" class="mb-2 mr-2"></span></div>