From d8aa8d69ba21d7846a72d51810a9f89f032a5ecb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 15 May 2013 09:57:58 -0400
Subject: [PATCH] Updated Tower icon per fournova's request
---
src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index 4d27589..49d8ae5 100644
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -42,9 +42,9 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel;
-import com.gitblit.models.SubmoduleModel;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.RefModel;
+import com.gitblit.models.SubmoduleModel;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
@@ -204,17 +204,23 @@
item.add(links);
} else if (isSubmodule) {
// submodule
- item.add(new Label("hashLabel", submodulePath + "@"));
Repository repository = GitBlit.self().getRepository(repositoryName);
String submoduleId = JGitUtils.getSubmoduleCommitId(repository, path, entry);
repository.close();
- LinkPanel commitHash = new LinkPanel("hashLink", null, submoduleId.substring(0, hashLen),
- TreePage.class, WicketUtils.newObjectParameter(
- submodulePath, submoduleId));
- WicketUtils.setCssClass(commitHash, "shortsha1");
- WicketUtils.setHtmlTooltip(commitHash, submoduleId);
- item.add(commitHash.setEnabled(hasSubmodule));
-
+ if (StringUtils.isEmpty(submoduleId)) {
+ // not a submodule at this commit, just a matching path
+ item.add(new Label("hashLabel").setVisible(false));
+ item.add(new Label("hashLink").setVisible(false));
+ } else {
+ // really a submodule
+ item.add(new Label("hashLabel", submodulePath + "@"));
+ LinkPanel commitHash = new LinkPanel("hashLink", null, submoduleId.substring(0, hashLen),
+ TreePage.class, WicketUtils.newObjectParameter(
+ submodulePath, submoduleId));
+ WicketUtils.setCssClass(commitHash, "shortsha1");
+ WicketUtils.setHtmlTooltip(commitHash, submoduleId);
+ item.add(commitHash.setEnabled(hasSubmodule));
+ }
Fragment links = new Fragment("historyLinks", "treeLinks", this);
links.add(new BookmarkablePageLink<Void>("commitdiff", CommitDiffPage.class,
WicketUtils.newObjectParameter(repositoryName, entry.getName())));
--
Gitblit v1.9.1