Display an explanation in ticket page if the user can't propose commits

James Moger

2014-03-07 4affd0a3a4fe086b31a87d56616f74093d2ac715

 src/main/java/com/gitblit/manager/GitblitManager.java

@@ -50,6 +50,7 @@
import com.gitblit.models.FederationSet;
import com.gitblit.models.ForkModel;
import com.gitblit.models.GitClientApplication;
import com.gitblit.models.Mailing;
import com.gitblit.models.Metric;
import com.gitblit.models.ProjectModel;
import com.gitblit.models.RegistrantAccessPermission;
@@ -61,6 +62,7 @@
import com.gitblit.models.SettingModel;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.tickets.ITicketService;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.JGitUtils;
@@ -172,7 +174,8 @@
      if (!ArrayUtils.isEmpty(repository.owners)) {
         for (String owner : repository.owners) {
            UserModel originOwner = userManager.getUserModel(owner);
            if (originOwner != null) {
            if (originOwner != null && !originOwner.canClone(cloneModel)) {
               // origin owner can't yet clone fork, grant explicit clone access
               originOwner.setRepositoryPermission(cloneName, AccessPermission.CLONE);
               reviseUser(originOwner.username, originOwner);
            }
@@ -185,8 +188,8 @@
      for (String name : users) {
         if (!name.equalsIgnoreCase(user.username)) {
            UserModel cloneUser = userManager.getUserModel(name);
            if (cloneUser.canClone(repository)) {
               // origin user can clone origin, grant clone access to fork
            if (cloneUser.canClone(repository) && !cloneUser.canClone(cloneModel)) {
               // origin user can't yet clone fork, grant explicit clone access
               cloneUser.setRepositoryPermission(cloneName, AccessPermission.CLONE);
            }
            cloneUsers.add(cloneUser);
@@ -199,8 +202,8 @@
      List<TeamModel> cloneTeams = new ArrayList<TeamModel>();
      for (String name : teams) {
         TeamModel cloneTeam = userManager.getTeamModel(name);
         if (cloneTeam.canClone(repository)) {
            // origin team can clone origin, grant clone access to fork
         if (cloneTeam.canClone(repository) && !cloneTeam.canClone(cloneModel)) {
            // origin team can't yet clone fork, grant explicit clone access
            cloneTeam.setRepositoryPermission(cloneName, AccessPermission.CLONE);
         }
         cloneTeams.add(cloneTeam);
@@ -337,8 +340,12 @@
   }

   protected String getRepositoryUrl(HttpServletRequest request, String username, RepositoryModel repository) {
      String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null);
      if (StringUtils.isEmpty(gitblitUrl)) {
         gitblitUrl = HttpUtils.getGitblitURL(request);
      }
      StringBuilder sb = new StringBuilder();
      sb.append(HttpUtils.getGitblitURL(request));
      sb.append(gitblitUrl);
      sb.append(Constants.R_PATH);
      sb.append(repository.name);

@@ -477,6 +484,15 @@
      }
   }

   /**
    * Throws an exception if trying to get a ticket service.
    *
    */
   @Override
   public ITicketService getTicketService() {
      throw new RuntimeException("This class does not have a ticket service!");
   }

   /*
    * ISTOREDSETTINGS
    *
@@ -579,28 +595,13 @@
   }

   @Override
   public void sendMail(String subject, String message, String... toAddresses) {
      notificationManager.sendMail(subject, message, toAddresses);
   }

   @Override
   public void sendHtmlMail(String subject, String message, Collection<String> toAddresses) {
      notificationManager.sendHtmlMail(subject, message, toAddresses);
   }

   @Override
   public void sendHtmlMail(String subject, String message, String... toAddresses) {
      notificationManager.sendHtmlMail(subject, message, toAddresses);
   }

   @Override
   public void sendHtmlMail(String from, String subject, String message, Collection<String> toAddresses) {
      notificationManager.sendHtmlMail(from, subject, message, toAddresses);
   }

   @Override
   public void sendHtmlMail(String from, String subject, String message, String... toAddresses) {
      notificationManager.sendHtmlMail(from, subject, message, toAddresses);
   public void send(Mailing mail) {
      notificationManager.send(mail);
   }

   /*
@@ -627,6 +628,11 @@
         user = federationManager.authenticate(httpRequest);
      }
      return user;
   }

   @Override
   public String getCookie(HttpServletRequest request) {
      return authenticationManager.getCookie(request);
   }

   @Override
@@ -1103,4 +1109,19 @@
   public boolean deletePendingFederationProposal(FederationProposal proposal) {
      return federationManager.deletePendingFederationProposal(proposal);
   }

   @Override
   public void closeAll() {
      repositoryManager.closeAll();
   }

   @Override
   public void close(String repository) {
      repositoryManager.close(repository);
   }

   @Override
   public boolean isIdle(Repository repository) {
      return repositoryManager.isIdle(repository);
   }
}