Reset build identifiers for next release

James Moger

2012-03-27 f5432e015d173f2665f7ca34735057e7b2b25d16

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

@@ -26,7 +26,6 @@
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;

@@ -44,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

@@ -94,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;

@@ -110,7 +110,7 @@
         @Override

         protected void onSubmit() {

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

               error("Please enter a username!");

               error(getString("gb.pleaseSetUsername"));

               return;

            }

            // force username to lower-case

@@ -119,14 +119,14 @@
            if (isCreate) {

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

               if (model != null) {

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

                  error(MessageFormat.format(getString("gb.usernameUnavailable"), username));

                  return;

               }

            }

            boolean rename = !StringUtils.isEmpty(oldName)

                  && !oldName.equalsIgnoreCase(username);

            if (!userModel.password.equals(confirmPassword.getObject())) {

               error("Passwords do not match!");

               error(getString("gb.passwordsDoNotMatch"));

               return;

            }

            String password = userModel.password;

@@ -139,8 +139,7 @@
                  minLength = 4;

               }

               if (password.trim().length() < minLength) {

                  error(MessageFormat.format(

                        "Password is too short. Minimum length is {0} characters.",

                  error(MessageFormat.format(getString("gb.passwordTooShort"),

                        minLength));

                  return;

               }

@@ -158,7 +157,7 @@
               }

            } else if (rename

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

               error("Gitblit is configured for combined-md5 password hashing. You must enter a new password on account rename.");

               error(getString("gb.combinedMd5Rename"));

               return;

            }



@@ -189,7 +188,7 @@
            setRedirect(false);

            if (isCreate) {

               // create another user

               info(MessageFormat.format("New user ''{0}'' successfully created.",

               info(MessageFormat.format(getString("gb.userCreated"),

                     userModel.username));

               setResponsePage(EditUserPage.class);

            } else {

@@ -216,8 +215,8 @@
      form.add(repositories);

      form.add(teams);



      form.add(new Button("save"));

      Button cancel = new Button("cancel") {

      form.add(new Button(getString("gb.save")));

      Button cancel = new Button(getString("gb.cancel")) {

         private static final long serialVersionUID = 1L;



         @Override