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/LogPage.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/wicket/pages/LogPage.java b/src/com/gitblit/wicket/pages/LogPage.java index 56ab07a..c012538 100644 --- a/src/com/gitblit/wicket/pages/LogPage.java +++ b/src/com/gitblit/wicket/pages/LogPage.java @@ -1,19 +1,62 @@ +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.gitblit.wicket.pages; 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.LogPanel; - public class LogPage extends RepositoryPage { public LogPage(PageParameters params) { super(params); - add(new LogPanel("logPanel", repositoryName, getRepository(), 100, true)); + addSyndicationDiscoveryLink(); + + int pageNumber = WicketUtils.getPage(params); + int prevPage = Math.max(0, pageNumber - 1); + int nextPage = pageNumber + 1; + LogPanel logPanel = new LogPanel("logPanel", repositoryName, objectId, getRepository(), -1, + pageNumber - 1); + boolean hasMore = logPanel.hasMore(); + add(logPanel); + + add(new BookmarkablePageLink<Void>("firstPageTop", LogPage.class, + WicketUtils.newObjectParameter(repositoryName, objectId)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("prevPageTop", LogPage.class, + WicketUtils.newLogPageParameter(repositoryName, objectId, prevPage)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("nextPageTop", LogPage.class, + WicketUtils.newLogPageParameter(repositoryName, objectId, nextPage)) + .setEnabled(hasMore)); + + add(new BookmarkablePageLink<Void>("firstPageBottom", LogPage.class, + WicketUtils.newObjectParameter(repositoryName, objectId)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("prevPageBottom", LogPage.class, + WicketUtils.newLogPageParameter(repositoryName, objectId, prevPage)) + .setEnabled(pageNumber > 1)); + add(new BookmarkablePageLink<Void>("nextPageBottom", LogPage.class, + WicketUtils.newLogPageParameter(repositoryName, objectId, nextPage)) + .setEnabled(hasMore)); } - + @Override protected String getPageName() { return getString("gb.log"); -- Gitblit v1.9.1