Replaced three history placeholder labels with real links.

James Moger

2011-04-16 01bd346efe98af0f05f23f897c0819d2df8d856c

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

@@ -14,12 +14,10 @@
import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.utils.JGitUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.LinkPanel;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;





public class CommitPage extends RepositoryPage {



@@ -28,35 +26,33 @@


      Repository r = getRepository();

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

		


      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"));

         add(new Label("commitdiffLink", getString("gb.commitdiff")));

      } else {

         add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), CommitPage.class, newCommitParameter(parents.get(0))));

         add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff", this, null), DiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

         add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff", this, null), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

      }

      add(new Label("patchLink", getString("gb.patch")));

		
      add(new LinkPanel("shortlog", "title", c.getShortMessage(), LogPage.class, newRepositoryParameter()));

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



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



      addRefs(r, c);



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

      String authorDate = GitBlitWebSession.get().formatDateTimeLong(c.getAuthorIdent().getWhen());

      add(new Label("commitAuthorDate", authorDate));

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



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

      String comitterDate = GitBlitWebSession.get().formatDateTimeLong(c.getCommitterIdent().getWhen());

      add(new Label("commitCommitterDate", comitterDate));

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



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



@@ -70,6 +66,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);

@@ -77,7 +75,7 @@
      addFullText("fullMessage", c.getFullMessage(), true);



      // changed paths list

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

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

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

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

         private static final long serialVersionUID = 1L;

@@ -90,10 +88,11 @@
            } else {

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

            }

				
            item.add(new BookmarkablePageLink<Void>("diff", DiffPage.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>("history", BlobPage.class).setEnabled(false));

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

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



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

@@ -101,7 +100,7 @@
      };

      add(pathsView);

   }

	


   @Override

   protected String getPageName() {

      return getString("gb.commit");