Skip to content

The Unified and Autonomous Development Platform

feat: Use plain text description for project instead of markdown (OD-2563)

Robin Shenf6a2273471db
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 2b1a3754e9..2d9d44ec31 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -73,7 +73,7 @@ import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.DependsOn;
import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Markdown;
+import io.onedev.server.annotation.Multiline;
import io.onedev.server.annotation.ProjectKey;
import io.onedev.server.annotation.ProjectName;
import io.onedev.server.annotation.SubscriptionRequired;
@@ -495,7 +495,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
}
@Editable(order=200)
- @Markdown
+ @Multiline
public String getDescription() {
return description;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
index 90e3f77665..52c9f8a7af 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
@@ -25,7 +25,7 @@
<div class="font-size-sm mt-1 text-muted"><wicket:t>Issues can be created in this project by sending email to this address</wicket:t></div>
</div>
</wicket:enclosure>
- <div wicket:id="description" class="mt-4"></div>
+ <div wicket:id="description" class="border-top pt-3 mt-3"></div>
<wicket:enclosure child="replicas">
<div class="font-weight-bolder font-size-lg mt-4 mb-2"><wicket:t>Replicas</wicket:t></div>
<table class="table mb-0">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
index 291137ff46..b00ce2f9e2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
@@ -43,8 +43,8 @@ import io.onedev.server.search.entity.project.ProjectQueryLexer;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ParsedEmailAddress;
import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.project.forkoption.ForkOptionPanel;
@@ -166,7 +166,7 @@ public abstract class ProjectInfoPanel extends Panel {
}
if (getProject().getDescription() != null)
- add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));
+ add(new MultilineLabel("description", Model.of(getProject().getDescription())));
else
add(new WebMarkupContainer("description").setVisible(false));