From 61b094152515532b42aa5e918f5405d82cde0440 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 13 Apr 2011 16:27:17 -0400
Subject: [PATCH] Fixed ticgit pages.
---
src/com/gitblit/wicket/pages/CommitPage.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java
index ad1fce0..7e3403d 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/com/gitblit/wicket/pages/CommitPage.java
@@ -5,30 +5,28 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.StringResourceModel;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.PathModel;
-import com.gitblit.wicket.panels.PathLinksPanel;
public class CommitPage extends RepositoryPage {
public CommitPage(PageParameters params) {
- super(params, "commit");
-
- final String commitId = params.getString("h", "");
+ super(params);
Repository r = getRepository();
- RevCommit c = JGitUtils.getCommit(r, commitId);
+ RevCommit c = JGitUtils.getCommit(r, objectId);
List<String> parents = new ArrayList<String>();
if (c.getParentCount() > 0) {
@@ -40,22 +38,22 @@
// commit page links
if (parents.size() == 0) {
add(new Label("parentLink", "none"));
+ add(new Label("commitdiffLink", getString("gb.commitdiff")));
} else {
add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), CommitPage.class, newCommitParameter(parents.get(0))));
+ add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff", this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
}
- add(new Label("patchLink", "patch"));
+ add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
- add(new LinkPanel("shortlog", "title", c.getShortMessage(), ShortLogPage.class, newRepositoryParameter()));
+ add(new LinkPanel("shortlog", "title", c.getShortMessage(), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
addRefs(r, c);
add(new Label("commitAuthor", JGitUtils.getDisplayName(c.getAuthorIdent())));
- String authorDate = GitBlitWebSession.get().formatDateTimeLong(c.getAuthorIdent().getWhen());
- add(new Label("commitAuthorDate", authorDate));
+ add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(), getTimeZone()));
add(new Label("commitCommitter", JGitUtils.getDisplayName(c.getCommitterIdent())));
- String comitterDate = GitBlitWebSession.get().formatDateTimeLong(c.getCommitterIdent().getWhen());
- add(new Label("commitCommitterDate", comitterDate));
+ add(WicketUtils.createTimestampLabel("commitCommitterDate", c.getCommitterIdent().getWhen(), getTimeZone()));
add(new Label("commitId", c.getName()));
@@ -69,6 +67,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);
@@ -76,7 +76,7 @@
addFullText("fullMessage", c.getFullMessage(), true);
// changed paths list
- List<PathModel> paths = JGitUtils.getCommitChangedPaths(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;
@@ -89,18 +89,21 @@
} else {
item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, newPathParameter(entry.path)));
}
- item.add(new PathLinksPanel("pathLinks", repositoryName, entry));
- String clazz = counter % 2 == 0 ? "dark" : "light";
- WicketUtils.setCssClass(item, clazz);
+
+ 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));
+
+ WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
};
add(pathsView);
-
- // close repository
- r.close();
-
- // footer
- addFooter();
+ }
+
+ @Override
+ protected String getPageName() {
+ return getString("gb.commit");
}
}
--
Gitblit v1.9.1