Add user. Implemented repository view and git access restrictions.

James Moger

2011-05-11 dfb88962fdbd29f59abe92178bb042738d57c3e1

 src/com/gitblit/wicket/pages/CommitPage.java

@@ -14,11 +14,13 @@
import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.JGitUtils.SearchType;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;



import com.gitblit.wicket.models.PathModel.PathChangeModel;

import com.gitblit.wicket.panels.CommitHeaderPanel;

import com.gitblit.wicket.panels.CommitLegendPanel;



public class CommitPage extends RepositoryPage {



@@ -26,15 +28,15 @@
      super(params);



      Repository r = getRepository();

      RevCommit c = JGitUtils.getCommit(r, objectId);

		
      RevCommit c = getCommit();



      List<String> parents = new ArrayList<String>();

      if (c.getParentCount() > 0) {

         for (RevCommit parent : c.getParents()) {

            parents.add(parent.name());

         }

      }

		


      // commit page links

      if (parents.size() == 0) {

         add(new Label("parentLink", "none"));

@@ -44,15 +46,17 @@
         add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff", this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

      }

      add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

		
      add(new LinkPanel("shortlog", "title", c.getShortMessage(), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

		


      add(new CommitHeaderPanel("commitHeader", repositoryName, c));



      addRefs(r, c);



      add(new Label("commitAuthor", JGitUtils.getDisplayName(c.getAuthorIdent())));

      // author

      add(createPersonPanel("commitAuthor", c.getAuthorIdent(), SearchType.AUTHOR));

      add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(), getTimeZone()));



      add(new Label("commitCommitter", JGitUtils.getDisplayName(c.getCommitterIdent())));

      // committer

      add(createPersonPanel("commitCommitter", c.getCommitterIdent(), SearchType.COMMITTER));

      add(WicketUtils.createTimestampLabel("commitCommitterDate", c.getCommitterIdent().getWhen(), getTimeZone()));



      add(new Label("commitId", c.getName()));

@@ -67,6 +71,8 @@
         public void populateItem(final Item<String> item) {

            String entry = item.getModelObject();

            item.add(new LinkPanel("commitParent", "list", entry, CommitPage.class, newCommitParameter(entry)));

            item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, newCommitParameter(entry)));

            item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, newCommitParameter(entry)));

         }

      };

      add(parentsView);

@@ -74,24 +80,29 @@
      addFullText("fullMessage", c.getFullMessage(), true);



      // changed paths list

      List<PathModel> paths  = JGitUtils.getFilesInCommit(r, c);

      ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);

      DataView<PathModel> pathsView = new DataView<PathModel>("changedPath", pathsDp) {

      List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c);	
      add(new CommitLegendPanel("commitLegend", paths));

      ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths);

      DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) {

         private static final long serialVersionUID = 1L;

         int counter = 0;



         public void populateItem(final Item<PathModel> item) {

            final PathModel entry = item.getModelObject();

         public void populateItem(final Item<PathChangeModel> item) {

            final PathChangeModel entry = item.getModelObject();

            Label changeType = new Label("changeType", "");

            WicketUtils.setChangeTypeCssClass(changeType, entry.changeType);

            setChangeTypeTooltip(changeType, entry.changeType);

            item.add(changeType);

            if (entry.isTree()) {

               item.add(new LinkPanel("pathName", null, entry.path, TreePage.class, newPathParameter(entry.path)));

            } else {

               item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, newPathParameter(entry.path)));

            }

				


            item.add(new BookmarkablePageLink<Void>("diff", BlobDiffPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));

            item.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));

            item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, newPathParameter(entry.path)));



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

@@ -99,7 +110,7 @@
      };

      add(pathsView);

   }

	


   @Override

   protected String getPageName() {

      return getString("gb.commit");