Merged #103 "flotr2 throws exception on small dashboards"

James Moger

2014-06-13 07eb0963cae3a403f8774f65afa20c940ce7124f

 src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -57,6 +57,7 @@


import com.gitblit.Constants;

import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Keys;

import com.gitblit.git.PatchsetCommand;

import com.gitblit.git.PatchsetReceivePack;

@@ -381,9 +382,16 @@
             * RESPONSIBLE LIST

             */

            Set<String> userlist = new TreeSet<String>(ticket.getParticipants());

            for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {

               if (rp.permission.atLeast(AccessPermission.PUSH) && !rp.isTeam()) {

                  userlist.add(rp.registrant);

            if (UserModel.ANONYMOUS.canPush(getRepositoryModel())

                  || AuthorizationControl.AUTHENTICATED == getRepositoryModel().authorizationControl) {

               //    authorization is ANONYMOUS or AUTHENTICATED (i.e. all users can be set responsible)

               userlist.addAll(app().users().getAllUsernames());

            } else {

               // authorization is by NAMED users (users with PUSH permission can be set responsible)

               for (RegistrantAccessPermission rp : app().repositories().getUserAccessPermissions(getRepositoryModel())) {

                  if (rp.permission.atLeast(AccessPermission.PUSH)) {

                     userlist.add(rp.registrant);

                  }

               }

            }

            List<TicketResponsible> responsibles = new ArrayList<TicketResponsible>();

@@ -774,12 +782,19 @@
         Fragment patchsetFrag = new Fragment("patchset", "patchsetFragment", this);

         patchsetFrag.add(new Label("commitsInPatchset", MessageFormat.format(getString("gb.commitsInPatchsetN"), currentPatchset.number)));



         // current revision

         MarkupContainer panel = createPatchsetPanel("panel", repository, user);

         patchsetFrag.add(panel);

         addUserAttributions(patchsetFrag, currentRevision, avatarWidth);

         addUserAttributions(panel, currentRevision, 0);

         addDateAttributions(panel, currentRevision);

         patchsetFrag.add(createMergePanel(user, repository));



         if (ticket.isOpen()) {

            // current revision

            MarkupContainer panel = createPatchsetPanel("panel", repository, user);

            patchsetFrag.add(panel);

            addUserAttributions(patchsetFrag, currentRevision, avatarWidth);

            addUserAttributions(panel, currentRevision, 0);

            addDateAttributions(panel, currentRevision);

         } else {

            // current revision

            patchsetFrag.add(new Label("panel").setVisible(false));

         }



         // commits

         List<RevCommit> commits = JGitUtils.getRevLog(getRepository(), currentPatchset.base, currentPatchset.tip);

@@ -1213,7 +1228,6 @@


      addPtCheckoutInstructions(user, repository, panel);

      addGitCheckoutInstructions(user, repository, panel);

      panel.add(createMergePanel(user, repository));



      return panel;

   }