Merge branch 'master' into rpc

James Moger

2011-10-02 f762b160efd5cafd919a6fd7f9587f578eceb454

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

@@ -44,7 +44,7 @@
import com.gitblit.wicket.WicketUtils;



@RequiresAdminRole

public class EditUserPage extends BasePage {

public class EditUserPage extends RootSubPage {



   private final boolean isCreate;



@@ -66,10 +66,11 @@


   protected void setupPage(final UserModel userModel) {

      if (isCreate) {

         super.setupPage("", getString("gb.newUser"));

         super.setupPage(getString("gb.newUser"), "");

      } else {

         super.setupPage("", getString("gb.edit"));

         super.setupPage(getString("gb.edit"), userModel.username);

      }

		
      final Model<String> confirmPassword = new Model<String>(

            StringUtils.isEmpty(userModel.password) ? "" : userModel.password);

      CompoundPropertyModel<UserModel> model = new CompoundPropertyModel<UserModel>(userModel);

@@ -156,8 +157,8 @@
                     userModel.username));

               setResponsePage(EditUserPage.class);

            } else {

               // back to home

               setResponsePage(RepositoriesPage.class);

               // back to users page

               setResponsePage(UsersPage.class);

            }

         }

      };

@@ -181,7 +182,7 @@


         @Override

         public void onSubmit() {

            setResponsePage(RepositoriesPage.class);

            setResponsePage(UsersPage.class);

         }

      };

      cancel.setDefaultFormProcessing(false);