Added support for displaying refs/pull/n/head|merge

James Moger

2013-05-24 51c76e7366c2e8851f1639fbdbf2b8deb219c7fc

 src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java

@@ -16,8 +16,6 @@
package com.gitblit.wicket.panels;



import java.text.MessageFormat;

import java.util.ArrayList;

import java.util.List;

import java.util.Map;



import org.apache.wicket.Component;

@@ -39,7 +37,6 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.BasePage;

import com.gitblit.wicket.pages.DocsPage;

import com.gitblit.wicket.pages.EditRepositoryPage;

import com.gitblit.wicket.pages.LogPage;

@@ -57,7 +54,6 @@
      super(wicketId);



      final boolean showSwatch = GitBlit.getBoolean(Keys.web.repositoryListSwatches, true);

      final boolean gitServlet = GitBlit.getBoolean(Keys.git.enableGitServlet, true);

      final boolean showSize = GitBlit.getBoolean(Keys.web.showRepositorySizes, true);



      // repository swatch

@@ -106,25 +102,6 @@
         add(WicketUtils.newImage("federatedIcon", "federated_16x16.png", localizer.getString("gb.isFederated", parent)));

      } else {

         add(WicketUtils.newClearPixel("federatedIcon").setVisible(false));

      }

      switch (entry.accessRestriction) {

      case NONE:

         add(WicketUtils.newBlankImage("accessRestrictionIcon").setVisible(false));

         break;

      case PUSH:

         add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png",

               accessRestrictions.get(entry.accessRestriction)));

         break;

      case CLONE:

         add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png",

               accessRestrictions.get(entry.accessRestriction)));

         break;

      case VIEW:

         add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png",

               accessRestrictions.get(entry.accessRestriction)));

         break;

      default:

         add(WicketUtils.newBlankImage("accessRestrictionIcon"));

      }



      if (ArrayUtils.isEmpty(entry.owners)) {

@@ -216,14 +193,6 @@


      add(new ExternalLink("syndication", SyndicationServlet.asLink("", entry.name, null, 0)));



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

      if (gitServlet) {

         // add the Gitblit repository url

         repositoryUrls.add(BasePage.getRepositoryUrl(entry));

      }

      repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(entry.name));



      String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.remove(0);

      add(new RepositoryUrlPanel("repositoryCloneUrl", primaryUrl));

      add(new RepositoryUrlPanel("repositoryPrimaryUrl", true, user, entry));

   }

}