diff options
| author | James Moger <james.moger@gitblit.com> | 2012-02-04 00:02:11 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-02-04 00:02:11 -0500 |
| commit | 9c4725cba1e4e07c55061afb435d0d4228cf89ba (patch) | |
| tree | 69b254137bb88ed30dad01e30417fded53d4cae2 | |
| parent | 7c08c78b0f80609f3ea911b8a3eeb598f99c0fd2 (diff) | |
| download | gitblit-9c4725cba1e4e07c55061afb435d0d4228cf89ba.tar.gz gitblit-9c4725cba1e4e07c55061afb435d0d4228cf89ba.zip | |
Clarify that log page/panel displays HEAD ref by default
| -rw-r--r-- | src/com/gitblit/wicket/pages/LogPage.java | 7 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/pages/SummaryPage.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/panels/LogPanel.java | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/com/gitblit/wicket/pages/LogPage.java b/src/com/gitblit/wicket/pages/LogPage.java index c012538f..d3dc3a9e 100644 --- a/src/com/gitblit/wicket/pages/LogPage.java +++ b/src/com/gitblit/wicket/pages/LogPage.java @@ -18,6 +18,7 @@ package com.gitblit.wicket.pages; import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.LogPanel;
@@ -31,7 +32,11 @@ public class LogPage extends RepositoryPage { 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,
+ String refid = objectId;
+ if (StringUtils.isEmpty(refid)) {
+ refid = getRepositoryModel().HEAD;
+ }
+ LogPanel logPanel = new LogPanel("logPanel", repositoryName, refid, getRepository(), -1,
pageNumber - 1);
boolean hasMore = logPanel.hasMore();
add(logPanel);
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java index 904ec44d..627fc5d8 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/com/gitblit/wicket/pages/SummaryPage.java @@ -129,7 +129,7 @@ public class SummaryPage extends RepositoryPage { add(new Label("otherUrls", StringUtils.flattenStrings(repositoryUrls, "<br/>"))
.setEscapeModelStrings(false));
- add(new LogPanel("commitsPanel", repositoryName, null, r, numberCommits, 0));
+ add(new LogPanel("commitsPanel", repositoryName, getRepositoryModel().HEAD, r, numberCommits, 0));
add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs).hideIfEmpty());
add(new BranchesPanel("branchesPanel", getRepositoryModel(), r, numberRefs).hideIfEmpty());
diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java index 90b6745f..74764d6d 100644 --- a/src/com/gitblit/wicket/panels/LogPanel.java +++ b/src/com/gitblit/wicket/panels/LogPanel.java @@ -76,13 +76,13 @@ public class LogPanel extends BasePanel { if (pageResults) {
// shortlog page
// show repository summary page link
- add(new LinkPanel("header", "title", repositoryName, SummaryPage.class,
+ add(new LinkPanel("header", "title", objectId, SummaryPage.class,
WicketUtils.newRepositoryParameter(repositoryName)));
} else {
// summary page
// show shortlog page link
- add(new LinkPanel("header", "title", new StringResourceModel("gb.log", this, null),
- LogPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
+ add(new LinkPanel("header", "title", objectId, LogPage.class,
+ WicketUtils.newRepositoryParameter(repositoryName)));
}
ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);
|