Skip to content

The Unified and Autonomous Development Platform

feat: Distinguish branch from tag in commits page with different icon

Robin Shen63f03cedcb10
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
index 9e2a0e4453..c0e419dac0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
@@ -48,7 +48,7 @@
</div>
<div class="labels">
<wicket:container wicket:id="labels">
- <span wicket:id="label" class="badge badge-info badge-sm mr-2"></span>
+ <span wicket:id="badge" class="badge badge-info badge-sm mr-2 align-middle"><svg wicket:id="icon" class="icon mr-1"/><span wicket:id="label"></span></span>
</wicket:container>
</div>
<a wicket:id="buildStatus" class="build-status mr-2"></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 1b60dc3eda..6b04338733 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -86,6 +86,7 @@ import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesLink;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
import io.onedev.server.web.component.workspace.speclist.WorkspaceSpecListPanel;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
@@ -218,7 +219,7 @@ public abstract class CommitListPanel extends Panel {
commitLabels = new ArrayList<>();
labels.put(commit.name(), commitLabels);
}
- commitLabels.add(Repository.shortenRefName(ref.getName()));
+ commitLabels.add(ref.getName());
}
}
return labels;
@@ -711,7 +712,11 @@ public abstract class CommitListPanel extends Panel {
commitLabels = new ArrayList<>();
for (String label: commitLabels) {
WebMarkupContainer container = new WebMarkupContainer(labelsView.newChildId());
- container.add(new Label("label", label));
+ boolean isTag = GitUtils.ref2tag(label) != null;
+ WebMarkupContainer badge = new WebMarkupContainer("badge");
+ badge.add(new SpriteImage("icon", isTag ? "tag" : "branch"));
+ badge.add(new Label("label", Repository.shortenRefName(label)));
+ container.add(badge);
labelsView.add(container);
}
item.add(labelsView);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
index ee5002014f..44364fee74 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
@@ -24,6 +24,11 @@
font-size: 1.1rem;
}
+.commit-list .labels .badge .icon {
+ width: 12px;
+ height: 12px;
+}
+
.commit-list .commit-message .highlight {
background: yellow;
}