James Moger
2012-10-18 13417cf9c6eec555b51da49742e47939d2f5715b
src/com/gitblit/client/EditUserDialog.java
@@ -78,6 +78,10 @@
   private JTextField emailAddressField;
   private JCheckBox canAdminCheckbox;
   private JCheckBox canForkCheckbox;
   private JCheckBox canCreateCheckbox;
   private JCheckBox notFederatedCheckbox;
@@ -126,9 +130,19 @@
      displayNameField = new JTextField(anUser.displayName == null ? "" : anUser.displayName, 25);
      emailAddressField = new JTextField(anUser.emailAddress == null ? "" : anUser.emailAddress, 25);
      canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin);      
      canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), anUser.canFork);
      canCreateCheckbox = new JCheckBox(Translation.get("gb.canCreateDescription"), anUser.canCreate);
      notFederatedCheckbox = new JCheckBox(
            Translation.get("gb.excludeFromFederationDescription"),
            anUser.excludeFromFederation);
      // credentials are optionally controlled by 3rd-party authentication
      usernameField.setEnabled(settings.supportsCredentialChanges);
      passwordField.setEnabled(settings.supportsCredentialChanges);
      confirmPasswordField.setEnabled(settings.supportsCredentialChanges);
      displayNameField.setEnabled(settings.supportsDisplayNameChanges);
      emailAddressField.setEnabled(settings.supportsEmailAddressChanges);
      JPanel fieldsPanel = new JPanel(new GridLayout(0, 1));
      fieldsPanel.add(newFieldPanel(Translation.get("gb.username"), usernameField));
@@ -137,12 +151,15 @@
      fieldsPanel.add(newFieldPanel(Translation.get("gb.displayName"), displayNameField));
      fieldsPanel.add(newFieldPanel(Translation.get("gb.emailAddress"), emailAddressField));
      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.excludeFromFederation"),
            notFederatedCheckbox));
      final Insets _insets = new Insets(5, 5, 5, 5);
      repositoryPalette = new JPalette<String>();
      teamsPalette = new JPalette<TeamModel>();
      teamsPalette.setEnabled(settings.supportsTeamMembershipChanges);
      JPanel fieldsPanelTop = new JPanel(new BorderLayout());
      fieldsPanelTop.add(fieldsPanel, BorderLayout.NORTH);
@@ -297,6 +314,8 @@
      user.emailAddress = emailAddressField.getText().trim();
      user.canAdmin = canAdminCheckbox.isSelected();
      user.canFork = canForkCheckbox.isSelected();
      user.canCreate = canCreateCheckbox.isSelected();
      user.excludeFromFederation = notFederatedCheckbox.isSelected();
      user.repositories.clear();
@@ -340,7 +359,7 @@
      }
      teamsPalette.setObjects(teams, selected);
   }
   public UserModel getUser() {
      if (canceled) {
         return null;