Added a file icon to the changed paths tables

James Moger

2012-03-20 6b5771f8099e83d8e2a5a77637eca232e6761b50

 src/com/gitblit/wicket/pages/EditUserPage.java

@@ -22,10 +22,10 @@
import java.util.List;



import org.apache.wicket.PageParameters;

import org.apache.wicket.behavior.SimpleAttributeModifier;

import org.apache.wicket.extensions.markup.html.form.palette.Palette;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.CheckBox;

import org.apache.wicket.markup.html.form.ChoiceRenderer;

import org.apache.wicket.markup.html.form.Form;

import org.apache.wicket.markup.html.form.PasswordTextField;

import org.apache.wicket.markup.html.form.TextField;

@@ -43,6 +43,7 @@
import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;



@RequiresAdminRole

@@ -93,10 +94,10 @@
      final String oldName = userModel.username;

      final Palette<String> repositories = new Palette<String>("repositories",

            new ListModel<String>(new ArrayList<String>(userModel.repositories)),

            new CollectionModel<String>(repos), new ChoiceRenderer<String>("", ""), 10, false);

            new CollectionModel<String>(repos), new StringChoiceRenderer(), 10, false);

      final Palette<String> teams = new Palette<String>("teams", new ListModel<String>(

            new ArrayList<String>(userTeams)), new CollectionModel<String>(GitBlit.self()

            .getAllTeamnames()), new ChoiceRenderer<String>("", ""), 10, false);

            .getAllTeamnames()), new StringChoiceRenderer(), 10, false);

      Form<UserModel> form = new Form<UserModel>("editForm", model) {



         private static final long serialVersionUID = 1L;

@@ -108,11 +109,13 @@
          */

         @Override

         protected void onSubmit() {

            String username = userModel.username;

            if (StringUtils.isEmpty(username)) {

            if (StringUtils.isEmpty(userModel.username)) {

               error("Please enter a username!");

               return;

            }

            // force username to lower-case

            userModel.username = userModel.username.toLowerCase();

            String username = userModel.username;

            if (isCreate) {

               UserModel model = GitBlit.self().getUserModel(username);

               if (model != null) {

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

                  // store MD5 digest of username+password

                  userModel.password = StringUtils.COMBINED_MD5_TYPE

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

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

               }

            } else if (rename

                  && password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

@@ -177,7 +180,7 @@
               userModel.teams.add(team);

            }



            try {

            try {					
               GitBlit.self().updateUserModel(oldName, userModel, isCreate);

            } catch (GitBlitException e) {

               error(e.getMessage());

@@ -195,6 +198,9 @@
            }

         }

      };

		
      // do not let the browser pre-populate these fields

      form.add(new SimpleAttributeModifier("autocomplete", "off"));



      // field names reflective match UserModel fields

      form.add(new TextField<String>("username"));