Merged #168 "Show account type in teams panel"

James Moger

2014-09-07 b2331a89980a43a6be95cb72364c6bdd33caf98a

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

@@ -50,6 +50,8 @@
import com.gitblit.tickets.TicketResponsible;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.SafeTextModel;

import com.gitblit.wicket.SafeTextModel.Mode;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.MarkdownTextArea;



@@ -110,8 +112,8 @@
      }



      typeModel = Model.of(ticket.type);

      titleModel = Model.of(ticket.title);

      topicModel = Model.of(ticket.topic == null ? "" : ticket.topic);

      titleModel = SafeTextModel.none(ticket.title);

      topicModel = SafeTextModel.none(ticket.topic == null ? "" : ticket.topic);

      responsibleModel = Model.of();

      milestoneModel = Model.of();

      mergeToModel = Model.of(ticket.mergeTo == null ? getRepositoryModel().mergeTo : ticket.mergeTo);

@@ -134,7 +136,7 @@
      form.add(new TextField<String>("title", titleModel));

      form.add(new TextField<String>("topic", topicModel));



      final IModel<String> markdownPreviewModel = new Model<String>();

      final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none);

      descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);

      descriptionPreview.setEscapeModelStrings(false);

      descriptionPreview.setOutputMarkupId(true);

@@ -171,7 +173,7 @@
         } 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) && !rp.isTeam()) {

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

                  userlist.add(rp.registrant);

               }

            }