More flexible authentication. Anonymous view, authenticated admin.

James Moger

2011-04-16 b55030a765f040a15609c60d3f69b6cb7f00bdae

 src/com/gitblit/wicket/panels/LogPanel.java

@@ -6,7 +6,6 @@


import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.panel.Panel;

import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

@@ -15,29 +14,30 @@
import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.StoredSettings;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.utils.JGitUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.CommitDiffPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.DiffPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.SummaryPage;

import com.gitblit.wicket.pages.TreePage;



public class LogPanel extends Panel {

public class LogPanel extends BasePanel {



   private static final long serialVersionUID = 1L;



   public LogPanel(String wicketId, final String repositoryName, String objectId, Repository r, int limit, int pageOffset) {

      super(wicketId);

      boolean pageResults = limit <= 0;

      int itemsPerPage = StoredSettings.getInteger("logPageCommitCount", 50);

      int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);

      if (itemsPerPage <= 1) {

         itemsPerPage = 50;

      }

		


      final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);

      List<RevCommit> commits;

      if (pageResults) {

@@ -68,13 +68,13 @@
            final RevCommit entry = item.getModelObject();

            final Date date = JGitUtils.getCommitDate(entry);



            item.add(WicketUtils.createDateLabel("commitDate", date, GitBlitWebSession.get().getTimezone()));

            item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone()));



            String author = entry.getAuthorIdent().getName();

            item.add(WicketUtils.createAuthorLabel("commitAuthor", author));



            String shortMessage = entry.getShortMessage();

            String trimmedMessage = WicketUtils.trimShortLog(shortMessage);

            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

            LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));

            if (!shortMessage.equals(trimmedMessage)) {

               WicketUtils.setHtmlTitle(shortlog, shortMessage);

@@ -84,7 +84,7 @@
            item.add(new RefsPanel("commitRefs", repositoryName, entry, allRefs));



            item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

            item.add(new BookmarkablePageLink<Void>("diff", DiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

            item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

            item.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));



            WicketUtils.setAlternatingBackground(item, counter);