James Moger
2012-02-04 9c4725cba1e4e07c55061afb435d0d4228cf89ba
Clarify that log page/panel displays HEAD ref by default
3 files modified
15 ■■■■■ changed files
src/com/gitblit/wicket/pages/LogPage.java 7 ●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/pages/SummaryPage.java 2 ●●● patch | view | raw | blame | history
src/com/gitblit/wicket/panels/LogPanel.java 6 ●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/pages/LogPage.java
@@ -18,6 +18,7 @@
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 @@
        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);
src/com/gitblit/wicket/pages/SummaryPage.java
@@ -129,7 +129,7 @@
        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());
src/com/gitblit/wicket/panels/LogPanel.java
@@ -76,13 +76,13 @@
        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);