From 0fec6711a6ca0bb18f21923fde16000702c3fa9c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 01 Mar 2014 09:21:32 -0500 Subject: [PATCH] Redirect to log page is the blobpage references a commit we can't find --- src/main/java/com/gitblit/wicket/panels/LogPanel.java | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/LogPanel.java b/src/main/java/com/gitblit/wicket/panels/LogPanel.java index a9f80db..dad25a0 100644 --- a/src/main/java/com/gitblit/wicket/panels/LogPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/LogPanel.java @@ -33,10 +33,9 @@ import org.eclipse.jgit.revwalk.RevCommit; import com.gitblit.Constants; -import com.gitblit.GitBlit; import com.gitblit.Keys; -import com.gitblit.BranchGraphServlet; import com.gitblit.models.RefModel; +import com.gitblit.servlet.BranchGraphServlet; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.ExternalImage; @@ -57,7 +56,7 @@ Repository r, int limit, int pageOffset, boolean showRemoteRefs) { super(wicketId); boolean pageResults = limit <= 0; - int itemsPerPage = GitBlit.getInteger(Keys.web.itemsPerPage, 50); + int itemsPerPage = app().settings().getInteger(Keys.web.itemsPerPage, 50); if (itemsPerPage <= 1) { itemsPerPage = 50; } @@ -75,10 +74,10 @@ // inaccurate way to determine if there are more commits. // works unless commits.size() represents the exact end. hasMore = commits.size() >= itemsPerPage; - + final String baseUrl = WicketUtils.getGitblitURL(getRequest()); - final boolean showGraph = GitBlit.getBoolean(Keys.web.showBranchGraph, true); - + final boolean showGraph = app().settings().getBoolean(Keys.web.showBranchGraph, true); + MarkupContainer graph = new WebMarkupContainer("graph"); add(graph); if (!showGraph || commits.isEmpty()) { @@ -101,12 +100,13 @@ WicketUtils.newRepositoryParameter(repositoryName))); } - final int hashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6); + final int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6); ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits); DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) { private static final long serialVersionUID = 1L; int counter; + @Override public void populateItem(final Item<RevCommit> item) { final RevCommit entry = item.getModelObject(); final Date date = JGitUtils.getCommitDate(entry); @@ -117,10 +117,10 @@ String author = entry.getAuthorIdent().getName(); LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author, GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName, - objectId, author, Constants.SearchType.AUTHOR)); + null, author, Constants.SearchType.AUTHOR)); setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR); item.add(authorLink); - + // merge icon if (entry.getParentCount() > 1) { item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png")); @@ -153,7 +153,7 @@ WicketUtils.setCssClass(commitHash, "shortsha1"); WicketUtils.setHtmlTooltip(commitHash, entry.getName()); item.add(commitHash); - + item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, WicketUtils .newObjectParameter(repositoryName, entry.getName())).setEnabled(entry .getParentCount() > 0)); -- Gitblit v1.9.1