From 9802a766a28bfcb0ae01494ebfa1cbeb11e71809 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 17 Apr 2011 12:06:29 -0400
Subject: [PATCH] Rename ticgit integration to tickets.
---
src/com/gitblit/wicket/pages/CommitPage.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java
index d906f07..63817ca 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/com/gitblit/wicket/pages/CommitPage.java
@@ -19,7 +19,6 @@
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.PathModel;
-
public class CommitPage extends RepositoryPage {
public CommitPage(PageParameters params) {
@@ -27,14 +26,14 @@
Repository r = getRepository();
RevCommit c = JGitUtils.getCommit(r, objectId);
-
+
List<String> parents = new ArrayList<String>();
if (c.getParentCount() > 0) {
for (RevCommit parent : c.getParents()) {
parents.add(parent.name());
}
}
-
+
// commit page links
if (parents.size() == 0) {
add(new Label("parentLink", "none"));
@@ -44,9 +43,9 @@
add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff", this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
}
add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
-
+
add(new LinkPanel("shortlog", "title", c.getShortMessage(), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
-
+
addRefs(r, c);
add(new Label("commitAuthor", JGitUtils.getDisplayName(c.getAuthorIdent())));
@@ -67,6 +66,8 @@
public void populateItem(final Item<String> item) {
String entry = item.getModelObject();
item.add(new LinkPanel("commitParent", "list", entry, CommitPage.class, newCommitParameter(entry)));
+ item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, newCommitParameter(entry)));
+ item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, newCommitParameter(entry)));
}
};
add(parentsView);
@@ -74,7 +75,7 @@
addFullText("fullMessage", c.getFullMessage(), true);
// changed paths list
- List<PathModel> paths = JGitUtils.getFilesInCommit(r, c);
+ List<PathModel> paths = JGitUtils.getFilesInCommit(r, c);
ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
DataView<PathModel> pathsView = new DataView<PathModel>("changedPath", pathsDp) {
private static final long serialVersionUID = 1L;
@@ -87,11 +88,11 @@
} else {
item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, newPathParameter(entry.path)));
}
-
+
item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, newPathParameter(entry.path)));
item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, newPathParameter(entry.path)));
item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));
- item.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));
+ item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, newPathParameter(entry.path)));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
@@ -99,7 +100,7 @@
};
add(pathsView);
}
-
+
@Override
protected String getPageName() {
return getString("gb.commit");
--
Gitblit v1.9.1