James Moger
2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef
src/com/gitblit/client/EditTeamDialog.java
@@ -71,6 +71,14 @@
   private JPalette<String> userPalette;
   private JPalette<String> preReceivePalette;
   private JLabel preReceiveInherited;
   private JPalette<String> postReceivePalette;
   private JLabel postReceiveInherited;
   private Set<String> teamnames;
   public EditTeamDialog(int protocolVersion, ServerSettings settings) {
@@ -141,10 +149,24 @@
      };
      usersPanel.add(userPalette, BorderLayout.CENTER);
      preReceivePalette = new JPalette<String>(true);
      preReceiveInherited = new JLabel();
      JPanel preReceivePanel = new JPanel(new BorderLayout(5, 5));
      preReceivePanel.add(preReceivePalette, BorderLayout.CENTER);
      preReceivePanel.add(preReceiveInherited, BorderLayout.WEST);
      postReceivePalette = new JPalette<String>(true);
      postReceiveInherited = new JLabel();
      JPanel postReceivePanel = new JPanel(new BorderLayout(5, 5));
      postReceivePanel.add(postReceivePalette, BorderLayout.CENTER);
      postReceivePanel.add(postReceiveInherited, BorderLayout.WEST);
      JTabbedPane panel = new JTabbedPane(JTabbedPane.TOP);
      panel.addTab(Translation.get("gb.general"), fieldsPanelTop);
      panel.addTab(Translation.get("gb.teamMembers"), usersPanel);
      panel.addTab(Translation.get("gb.restrictedRepositories"), repositoriesPanel);
      panel.addTab(Translation.get("gb.preReceiveScripts"), preReceivePanel);
      panel.addTab(Translation.get("gb.postReceiveScripts"), postReceivePanel);
      JButton createButton = new JButton(Translation.get("gb.save"));
      createButton.addActionListener(new ActionListener() {
@@ -241,6 +263,13 @@
      team.users.clear();
      team.users.addAll(userPalette.getSelections());
      team.preReceiveScripts.clear();
      team.preReceiveScripts.addAll(preReceivePalette.getSelections());
      team.postReceiveScripts.clear();
      team.postReceiveScripts.addAll(postReceivePalette.getSelections());
      return true;
   }
@@ -278,6 +307,38 @@
      userPalette.setObjects(users, selected);
   }
   public void setPreReceiveScripts(List<String> unused, List<String> inherited,
         List<String> selected) {
      Collections.sort(unused);
      if (selected != null) {
         Collections.sort(selected);
      }
      preReceivePalette.setObjects(unused, selected);
      showInherited(inherited, preReceiveInherited);
   }
   public void setPostReceiveScripts(List<String> unused, List<String> inherited,
         List<String> selected) {
      Collections.sort(unused);
      if (selected != null) {
         Collections.sort(selected);
      }
      postReceivePalette.setObjects(unused, selected);
      showInherited(inherited, postReceiveInherited);
   }
   private void showInherited(List<String> list, JLabel label) {
      StringBuilder sb = new StringBuilder();
      if (list != null && list.size() > 0) {
         sb.append("<html><body><b>INHERITED</b><ul style=\"margin-left:5px;list-style-type: none;\">");
         for (String script : list) {
            sb.append("<li>").append(script).append("</li>");
         }
         sb.append("</ul></body></html>");
      }
      label.setText(sb.toString());
   }
   public TeamModel getTeam() {
      if (canceled) {
         return null;