From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 05 Jan 2012 17:34:05 -0500 Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders --- src/com/gitblit/wicket/pages/HistoryPage.java | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/com/gitblit/wicket/pages/HistoryPage.java b/src/com/gitblit/wicket/pages/HistoryPage.java index 290bb68..122eeb8 100644 --- a/src/com/gitblit/wicket/pages/HistoryPage.java +++ b/src/com/gitblit/wicket/pages/HistoryPage.java @@ -18,7 +18,6 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.link.BookmarkablePageLink; -import com.gitblit.wicket.RepositoryPage; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.HistoryPanel; @@ -32,17 +31,30 @@ int prevPage = Math.max(0, pageNumber - 1); int nextPage = pageNumber + 1; - HistoryPanel history = new HistoryPanel("historyPanel", repositoryName, objectId, path, getRepository(), -1, pageNumber - 1); + HistoryPanel history = new HistoryPanel("historyPanel", repositoryName, objectId, path, + getRepository(), -1, pageNumber - 1); boolean hasMore = history.hasMore(); add(history); - add(new BookmarkablePageLink<Void>("firstPageTop", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, path)).setEnabled(pageNumber > 1)); - add(new BookmarkablePageLink<Void>("prevPageTop", HistoryPage.class, WicketUtils.newHistoryPageParameter(repositoryName, objectId, path, prevPage)).setEnabled(pageNumber > 1)); - add(new BookmarkablePageLink<Void>("nextPageTop", HistoryPage.class, WicketUtils.newHistoryPageParameter(repositoryName, objectId, path, nextPage)).setEnabled(hasMore)); + add(new BookmarkablePageLink<Void>("firstPageTop", HistoryPage.class, + WicketUtils.newPathParameter(repositoryName, objectId, path)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("prevPageTop", HistoryPage.class, + WicketUtils.newHistoryPageParameter(repositoryName, objectId, path, prevPage)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("nextPageTop", HistoryPage.class, + WicketUtils.newHistoryPageParameter(repositoryName, objectId, path, nextPage)) + .setEnabled(hasMore)); - add(new BookmarkablePageLink<Void>("firstPageBottom", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, path)).setEnabled(pageNumber > 1)); - add(new BookmarkablePageLink<Void>("prevPageBottom", HistoryPage.class, WicketUtils.newHistoryPageParameter(repositoryName, objectId, path, prevPage)).setEnabled(pageNumber > 1)); - add(new BookmarkablePageLink<Void>("nextPageBottom", HistoryPage.class, WicketUtils.newHistoryPageParameter(repositoryName, objectId, path, nextPage)).setEnabled(hasMore)); + add(new BookmarkablePageLink<Void>("firstPageBottom", HistoryPage.class, + WicketUtils.newPathParameter(repositoryName, objectId, path)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("prevPageBottom", HistoryPage.class, + WicketUtils.newHistoryPageParameter(repositoryName, objectId, path, prevPage)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("nextPageBottom", HistoryPage.class, + WicketUtils.newHistoryPageParameter(repositoryName, objectId, path, nextPage)) + .setEnabled(hasMore)); } -- Gitblit v1.9.1