diff options
| author | James Moger <james.moger@gitblit.com> | 2012-11-27 17:13:03 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-11-27 17:13:03 -0500 |
| commit | 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5 (patch) | |
| tree | b2a4f1eae5840402b09f9ac1eb6038adaa85b1fb /src/com | |
| parent | d83bd6d3acfc88a991a08a15dfa3ac36770bb0b8 (diff) | |
| download | gitblit-73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5.tar.gz gitblit-73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5.zip | |
Added short commit id column to log and history tables (issue 168)
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/gitblit/wicket/panels/HistoryPanel.html | 1 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/panels/HistoryPanel.java | 9 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/panels/LogPanel.html | 1 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/panels/LogPanel.java | 9 |
4 files changed, 20 insertions, 0 deletions
diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.html b/src/com/gitblit/wicket/panels/HistoryPanel.html index d81d948b..2fe6f050 100644 --- a/src/com/gitblit/wicket/panels/HistoryPanel.html +++ b/src/com/gitblit/wicket/panels/HistoryPanel.html @@ -19,6 +19,7 @@ <td class="date"><span wicket:id="commitDate">[commit date]</span></td>
<td class="icon"><img wicket:id="commitIcon" /></td>
<td class="hidden-phone author"><span wicket:id="commitAuthor">[commit author]</span></td>
+ <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>
<td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>
<td class="hidden-phone rightAlign">
<span wicket:id="historyLinks">[history links]</span>
diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java index dee5c25c..838f103e 100644 --- a/src/com/gitblit/wicket/panels/HistoryPanel.java +++ b/src/com/gitblit/wicket/panels/HistoryPanel.java @@ -118,6 +118,7 @@ public class HistoryPanel extends BasePanel { // breadcrumbs
add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));
+ final int hashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);
ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);
DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) {
private static final long serialVersionUID = 1L;
@@ -138,6 +139,14 @@ public class HistoryPanel extends BasePanel { setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
item.add(authorLink);
+ // commit hash link
+ LinkPanel commitHash = new LinkPanel("commitHash", null, entry.getName().substring(0, hashLen),
+ CommitPage.class, WicketUtils.newObjectParameter(
+ repositoryName, entry.getName()));
+ WicketUtils.setCssClass(commitHash, "sha1");
+ WicketUtils.setHtmlTooltip(commitHash, entry.getName());
+ item.add(commitHash);
+
// merge icon
if (entry.getParentCount() > 1) {
item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));
diff --git a/src/com/gitblit/wicket/panels/LogPanel.html b/src/com/gitblit/wicket/panels/LogPanel.html index c5ae71cb..f6c2327e 100644 --- a/src/com/gitblit/wicket/panels/LogPanel.html +++ b/src/com/gitblit/wicket/panels/LogPanel.html @@ -14,6 +14,7 @@ <tr wicket:id="commit">
<td class="date" style="width:6em;"><span wicket:id="commitDate">[commit date]</span></td>
<td class="hidden-phone author"><span wicket:id="commitAuthor">[commit author]</span></td>
+ <td class="hidden-phone hidden-tablet"><span wicket:id="commitHash">[commit hash]</span></td>
<td class="hidden-phone icon"><img wicket:id="commitIcon" /></td>
<td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>
<td class="hidden-phone hidden-tablet rightAlign">
diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java index a31c3dfa..6d06e7b8 100644 --- a/src/com/gitblit/wicket/panels/LogPanel.java +++ b/src/com/gitblit/wicket/panels/LogPanel.java @@ -82,6 +82,7 @@ public class LogPanel extends BasePanel { WicketUtils.newRepositoryParameter(repositoryName)));
}
+ final int hashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);
ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);
DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) {
private static final long serialVersionUID = 1L;
@@ -100,6 +101,14 @@ public class LogPanel extends BasePanel { objectId, author, Constants.SearchType.AUTHOR));
setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
item.add(authorLink);
+
+ // commit hash link
+ LinkPanel commitHash = new LinkPanel("commitHash", null, entry.getName().substring(0, hashLen),
+ CommitPage.class, WicketUtils.newObjectParameter(
+ repositoryName, entry.getName()));
+ WicketUtils.setCssClass(commitHash, "sha1");
+ WicketUtils.setHtmlTooltip(commitHash, entry.getName());
+ item.add(commitHash);
// merge icon
if (entry.getParentCount() > 1) {
|