Lukasz Jader
2012-07-14 7cd88ddbd93b115aeda76b87b1c99f9afa4aaaef
src/com/gitblit/client/EditUserDialog.java
@@ -72,6 +72,10 @@
   private JPasswordField passwordField;
   private JPasswordField confirmPasswordField;
   private JTextField displayNameField;
   private JTextField emailAddressField;
   private JCheckBox canAdminCheckbox;
@@ -119,15 +123,27 @@
      passwordField = new JPasswordField(anUser.password == null ? "" : anUser.password, 25);
      confirmPasswordField = new JPasswordField(anUser.password == null ? "" : anUser.password,
            25);
      canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin);
      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);
      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));
      fieldsPanel.add(newFieldPanel(Translation.get("gb.password"), passwordField));
      fieldsPanel.add(newFieldPanel(Translation.get("gb.confirmPassword"), confirmPasswordField));
      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.excludeFromFederation"),
            notFederatedCheckbox));
@@ -135,6 +151,7 @@
      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);
@@ -284,6 +301,9 @@
         // no change in password
         user.password = password;
      }
      user.displayName = displayNameField.getText().trim();
      user.emailAddress = emailAddressField.getText().trim();
      user.canAdmin = canAdminCheckbox.isSelected();
      user.excludeFromFederation = notFederatedCheckbox.isSelected();
@@ -329,7 +349,7 @@
      }
      teamsPalette.setObjects(teams, selected);
   }
   public UserModel getUser() {
      if (canceled) {
         return null;