Improve relative path determination using Java 7 Paths

James Moger

2014-10-10 a74ddc24545ec45d0bb82ca2bb8f628ffdaa9da3

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

@@ -154,6 +154,9 @@
                     return;

                  }



                  // change the cookie

                  userModel.cookie = StringUtils.getSHA1(userModel.username + password);



                  // Optionally store the password MD5 digest.

                  String type = app().settings().getString(Keys.realm.passwordStorage, "md5");

                  if (type.equalsIgnoreCase("md5")) {

@@ -188,7 +191,11 @@
            }



            try {

               app().gitblit().updateUserModel(oldName, userModel, isCreate);

               if (isCreate) {

                  app().gitblit().addUser(userModel);

               } else {

                  app().gitblit().reviseUser(oldName, userModel);

               }

            } catch (GitBlitException e) {

               error(e.getMessage());

               return;

@@ -232,10 +239,35 @@
      form.add(confirmPasswordField.setEnabled(editCredentials));

      form.add(new TextField<String>("displayName").setEnabled(editDisplayName));

      form.add(new TextField<String>("emailAddress").setEnabled(editEmailAddress));

      form.add(new CheckBox("canAdmin"));

      form.add(new CheckBox("canFork").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));

      form.add(new CheckBox("canCreate"));



      if (userModel.canAdmin() && !userModel.canAdmin) {

         // user inherits Admin permission

         // display a disabled-yet-checked checkbox

         form.add(new CheckBox("canAdmin", Model.of(true)).setEnabled(false));

      } else {

         form.add(new CheckBox("canAdmin"));

      }



      if (userModel.canFork() && !userModel.canFork) {

         // user inherits Fork permission

         // display a disabled-yet-checked checkbox

         form.add(new CheckBox("canFork", Model.of(true)).setEnabled(false));

      } else {

         final boolean forkingAllowed = app().settings().getBoolean(Keys.web.allowForking, true);

         form.add(new CheckBox("canFork").setEnabled(forkingAllowed));

      }



      if (userModel.canCreate() && !userModel.canCreate) {

         // user inherits Create permission

         // display a disabled-yet-checked checkbox

         form.add(new CheckBox("canCreate", Model.of(true)).setEnabled(false));

      } else {

         form.add(new CheckBox("canCreate"));

      }



      form.add(new CheckBox("excludeFromFederation"));

      form.add(new CheckBox("disabled"));



      form.add(new RegistrantPermissionsPanel("repositories",   RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions()));

      form.add(teams.setEnabled(editTeams));