From b0e164283fee6f993589cce849ba1fc7d294e89d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 19 Oct 2012 22:47:33 -0400
Subject: [PATCH] New permissions UI for EditUser and EditTeam (issue 36)

---
 src/com/gitblit/client/EditTeamDialog.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/client/EditTeamDialog.java b/src/com/gitblit/client/EditTeamDialog.java
index a04ed2c..57d6bcf 100644
--- a/src/com/gitblit/client/EditTeamDialog.java
+++ b/src/com/gitblit/client/EditTeamDialog.java
@@ -33,6 +33,7 @@
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -64,12 +65,26 @@
 	private boolean canceled = true;
 
 	private JTextField teamnameField;
+	
+	private JCheckBox canAdminCheckbox;
+	
+	private JCheckBox canForkCheckbox;
+	
+	private JCheckBox canCreateCheckbox;
 
 	private JTextField mailingListsField;
 
 	private JPalette<String> repositoryPalette;
 
 	private JPalette<String> userPalette;
+
+	private JPalette<String> preReceivePalette;
+
+	private JLabel preReceiveInherited;
+
+	private JPalette<String> postReceivePalette;
+
+	private JLabel postReceiveInherited;
 
 	private Set<String> teamnames;
 
@@ -107,17 +122,26 @@
 	private void initialize(int protocolVersion, TeamModel aTeam) {
 		teamnameField = new JTextField(aTeam.name == null ? "" : aTeam.name, 25);
 
+		canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), aTeam.canAdmin);		
+		canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), aTeam.canFork);
+		canCreateCheckbox = new JCheckBox(Translation.get("gb.canCreateDescription"), aTeam.canCreate);
+
 		mailingListsField = new JTextField(aTeam.mailingLists == null ? ""
 				: StringUtils.flattenStrings(aTeam.mailingLists, " "), 50);
 
 		JPanel fieldsPanel = new JPanel(new GridLayout(0, 1));
 		fieldsPanel.add(newFieldPanel(Translation.get("gb.teamName"), teamnameField));
+		fieldsPanel.add(newFieldPanel(Translation.get("gb.canAdmin"), canAdminCheckbox));
+		fieldsPanel.add(newFieldPanel(Translation.get("gb.canFork"), canForkCheckbox));
+		fieldsPanel.add(newFieldPanel(Translation.get("gb.canCreate"), canCreateCheckbox));
+
 		fieldsPanel.add(newFieldPanel(Translation.get("gb.mailingLists"), mailingListsField));
 
 		final Insets _insets = new Insets(5, 5, 5, 5);
 		repositoryPalette = new JPalette<String>();
 		userPalette = new JPalette<String>();
-
+		userPalette.setEnabled(settings.supportsTeamMembershipChanges);
+		
 		JPanel fieldsPanelTop = new JPanel(new BorderLayout());
 		fieldsPanelTop.add(fieldsPanel, BorderLayout.NORTH);
 
@@ -141,10 +165,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() {
@@ -223,6 +261,10 @@
 		}
 		team.name = tname;
 
+		team.canAdmin = canAdminCheckbox.isSelected();
+		team.canFork = canForkCheckbox.isSelected();
+		team.canCreate = canCreateCheckbox.isSelected();
+
 		String ml = mailingListsField.getText();
 		if (!StringUtils.isEmpty(ml)) {
 			Set<String> list = new HashSet<String>();
@@ -241,6 +283,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 +327,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;

--
Gitblit v1.9.1