Owner editing. Frozen status. Grouped repositories. Documentation.

James Moger

2011-05-19 00afd77a2182ece3d9522d41b86b4ddd7e132288

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

@@ -15,8 +15,8 @@
import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.utils.JGitUtils.SearchType;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.CommitDiffPage;

@@ -33,7 +33,7 @@
   public SearchPanel(String wicketId, final String repositoryName, final String objectId, final String value, SearchType searchType, Repository r, int limit, int pageOffset) {

      super(wicketId);

      boolean pageResults = limit <= 0;

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

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

      if (itemsPerPage <= 1) {

         itemsPerPage = 50;

      }

@@ -55,7 +55,7 @@
      hasMore = commits.size() >= itemsPerPage;



      // header

      add(new LinkPanel("header", "title", commit.getShortMessage(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, commit.getName())));

      add(new LinkPanel("header", "title", commit == null ? "":commit.getShortMessage(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, commit == null ? "":commit.getName())));



      ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);

      DataView<RevCommit> searchView = new DataView<RevCommit>("commit", dp) {

@@ -74,12 +74,19 @@
            setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR);

            item.add(authorLink);



            // merge icon

            if (entry.getParentCount() > 1) {

               item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));

            } else {

               item.add(WicketUtils.newBlankImage("commitIcon"));

            }



            String shortMessage = entry.getShortMessage();

            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

            // TODO highlight matches

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

            if (!shortMessage.equals(trimmedMessage)) {

               WicketUtils.setHtmlTitle(shortlog, shortMessage);

               WicketUtils.setHtmlTooltip(shortlog, shortMessage);

            }

            item.add(shortlog);