Skip to content

The Unified and Autonomous Development Platform

fix issue #30, fix issue #31

Robin Shend321dc77bdf6
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
index 904ba4490e..023f247b37 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
@@ -4,7 +4,10 @@ import javax.annotation.Nullable;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
+import org.unbescape.html.HtmlEscape;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.util.ProjectScopedNumber;
@@ -25,6 +28,9 @@ public class BuildProcessor extends ReferenceParser implements MarkdownProcessor
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
CharSequence url = RequestCycle.get().urlFor(
BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable, null));
+ Build build = OneDev.getInstance(BuildManager.class).find(referenceable);
+ if (build != null && build.getVersion() != null)
+ referenceText += " (" + HtmlEscape.escapeHtml5(build.getVersion()) + ")";
return String.format("<a href='%s' class='build reference' data-reference='%s'>%s</a>",
url, referenceable.toString(), referenceText);
}
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.java
index a1d469cdcf..351621d03a 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
@@ -95,11 +95,14 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
} else if (getField().getType().equals(FieldSpec.BUILD)) {
Build build = OneDev.getInstance(BuildManager.class)
.find(getIssue().getProject(), Long.valueOf(value));
- if (build != null && SecurityUtils.canAccess(build)) {
+ if (build != null) {
Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link",
BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));
- link.add(new Label("label", "#" + build.getNumber()));
+ String buildInfo = "#" + build.getNumber();
+ if (build.getVersion() != null)
+ buildInfo += " (" + build.getVersion() + ")";
+ link.add(new Label("label", buildInfo));
linkFrag.add(link);
item.add(linkFrag);
} else {