Strip folder name and .git from repo links in the project view

James Moger

2012-09-10 fabe060d3a435f116128851f828e35c2af5fde67

 src/com/gitblit/client/EditUserDialog.java

@@ -72,13 +72,17 @@
   private JPasswordField passwordField;



   private JPasswordField confirmPasswordField;

	
   private JTextField displayNameField;

	
   private JTextField emailAddressField;



   private JCheckBox canAdminCheckbox;



   private JCheckBox notFederatedCheckbox;



   private JPalette<String> repositoryPalette;

	


   private JPalette<TeamModel> teamsPalette;



   private Set<String> usernames;

@@ -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,10 +151,11 @@
      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);

		


      JPanel repositoriesPanel = new JPanel(new BorderLayout()) {



         private static final long serialVersionUID = 1L;

@@ -166,7 +183,6 @@
      }

      panel.addTab(Translation.get("gb.restrictedRepositories"), repositoriesPanel);





      JButton createButton = new JButton(Translation.get("gb.save"));

      createButton.addActionListener(new ActionListener() {

         public void actionPerformed(ActionEvent event) {

@@ -188,7 +204,7 @@
      JPanel controls = new JPanel();

      controls.add(cancelButton);

      controls.add(createButton);

		


      JPanel centerPanel = new JPanel(new BorderLayout(5, 5)) {



         private static final long serialVersionUID = 1L;

@@ -217,16 +233,15 @@
   }



   private boolean validateFields() {

      String uname = usernameField.getText();

      if (StringUtils.isEmpty(uname)) {

      if (StringUtils.isEmpty(usernameField.getText())) {

         error("Please enter a username!");

         return false;

      }



      String uname = usernameField.getText().toLowerCase();

      boolean rename = false;

      // verify username uniqueness on create

      if (isCreate) {

         if (usernames.contains(uname.toLowerCase())) {

         if (usernames.contains(uname)) {

            error(MessageFormat.format("Username ''{0}'' is unavailable.", uname));

            return false;

         }

@@ -234,7 +249,7 @@
         // check rename collision

         rename = !StringUtils.isEmpty(username) && !username.equalsIgnoreCase(uname);

         if (rename) {

            if (usernames.contains(uname.toLowerCase())) {

            if (usernames.contains(uname)) {

               error(MessageFormat.format(

                     "Failed to rename ''{0}'' because ''{1}'' already exists.", username,

                     uname));

@@ -274,7 +289,7 @@
         } else if (type.equalsIgnoreCase("combined-md5")) {

            // store MD5 digest of username+password

            user.password = StringUtils.COMBINED_MD5_TYPE

                  + StringUtils.getMD5(username.toLowerCase() + password);

                  + StringUtils.getMD5(user.username + password);

         } else {

            // plain-text password

            user.password = password;

@@ -286,13 +301,16 @@
         // 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();



      user.repositories.clear();

      user.repositories.addAll(repositoryPalette.getSelections());

		


      user.teams.clear();

      user.teams.addAll(teamsPalette.getSelections());

      return true;

@@ -323,7 +341,7 @@
      }

      repositoryPalette.setObjects(restricted, selected);

   }

	


   public void setTeams(List<TeamModel> teams, List<TeamModel> selected) {

      Collections.sort(teams);

      if (selected != null) {

@@ -331,7 +349,7 @@
      }

      teamsPalette.setObjects(teams, selected);

   }



	
   public UserModel getUser() {

      if (canceled) {

         return null;