mirror of
https://github.com/theonedev/onedev.git
synced 2025-12-08 18:26:30 +00:00
feat: Use plain text description for project instead of markdown (OD-2563)
This commit is contained in:
parent
aeb94bc272
commit
f6a2273471
@ -73,7 +73,7 @@ import io.onedev.commons.utils.match.StringMatcher;
|
|||||||
import io.onedev.server.OneDev;
|
import io.onedev.server.OneDev;
|
||||||
import io.onedev.server.annotation.DependsOn;
|
import io.onedev.server.annotation.DependsOn;
|
||||||
import io.onedev.server.annotation.Editable;
|
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.ProjectKey;
|
||||||
import io.onedev.server.annotation.ProjectName;
|
import io.onedev.server.annotation.ProjectName;
|
||||||
import io.onedev.server.annotation.SubscriptionRequired;
|
import io.onedev.server.annotation.SubscriptionRequired;
|
||||||
@ -495,7 +495,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Editable(order=200)
|
@Editable(order=200)
|
||||||
@Markdown
|
@Multiline
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
return description;
|
return description;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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 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>
|
</div>
|
||||||
</wicket:enclosure>
|
</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">
|
<wicket:enclosure child="replicas">
|
||||||
<div class="font-weight-bolder font-size-lg mt-4 mb-2"><wicket:t>Replicas</wicket:t></div>
|
<div class="font-weight-bolder font-size-lg mt-4 mb-2"><wicket:t>Replicas</wicket:t></div>
|
||||||
<table class="table mb-0">
|
<table class="table mb-0">
|
||||||
|
|||||||
@ -43,8 +43,8 @@ import io.onedev.server.search.entity.project.ProjectQueryLexer;
|
|||||||
import io.onedev.server.security.SecurityUtils;
|
import io.onedev.server.security.SecurityUtils;
|
||||||
import io.onedev.server.util.ParsedEmailAddress;
|
import io.onedev.server.util.ParsedEmailAddress;
|
||||||
import io.onedev.server.util.criteria.Criteria;
|
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.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.ModalLink;
|
||||||
import io.onedev.server.web.component.modal.ModalPanel;
|
import io.onedev.server.web.component.modal.ModalPanel;
|
||||||
import io.onedev.server.web.component.project.forkoption.ForkOptionPanel;
|
import io.onedev.server.web.component.project.forkoption.ForkOptionPanel;
|
||||||
@ -166,7 +166,7 @@ public abstract class ProjectInfoPanel extends Panel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (getProject().getDescription() != null)
|
if (getProject().getDescription() != null)
|
||||||
add(new MarkdownViewer("description", Model.of(getProject().getDescription()), null));
|
add(new MultilineLabel("description", Model.of(getProject().getDescription())));
|
||||||
else
|
else
|
||||||
add(new WebMarkupContainer("description").setVisible(false));
|
add(new WebMarkupContainer("description").setVisible(false));
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user