From d97e52ef501a72fcf16aee02d7e79c91d123dfe6 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 24 Aug 2012 13:32:44 -0400 Subject: [PATCH] Implemented custom request handling for (un)authenticated sessions to workaround Wicket bugs --- src/com/gitblit/wicket/panels/HistoryPanel.java | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java index 23eb2b3..befd701 100644 --- a/src/com/gitblit/wicket/panels/HistoryPanel.java +++ b/src/com/gitblit/wicket/panels/HistoryPanel.java @@ -38,16 +38,13 @@ import com.gitblit.models.RefModel; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; -import com.gitblit.wicket.GitBlitWebApp; -import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.pages.BasePage; import com.gitblit.wicket.pages.BlobDiffPage; import com.gitblit.wicket.pages.BlobPage; import com.gitblit.wicket.pages.CommitDiffPage; import com.gitblit.wicket.pages.CommitPage; import com.gitblit.wicket.pages.HistoryPage; -import com.gitblit.wicket.pages.SearchPage; +import com.gitblit.wicket.pages.GitSearchPage; import com.gitblit.wicket.pages.TreePage; public class HistoryPanel extends BasePanel { @@ -97,9 +94,6 @@ // breadcrumbs add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId)); - GitBlitWebApp app = (GitBlitWebApp) GitBlitWebSession.get().getApplication(); - final Class<? extends BasePage> searchPageClass = app.getSearchPageClass(); - ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits); DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) { private static final long serialVersionUID = 1L; @@ -109,12 +103,13 @@ final RevCommit entry = item.getModelObject(); final Date date = JGitUtils.getCommitDate(entry); - item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone())); + item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils())); // author search link String author = entry.getAuthorIdent().getName(); LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author, - searchPageClass, WicketUtils.newSearchParameter(repositoryName, objectId, + GitSearchPage.class, + WicketUtils.newSearchParameter(repositoryName, objectId, author, Constants.SearchType.AUTHOR)); setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR); item.add(authorLink); -- Gitblit v1.9.1