Fix setting wrrong custom mode on file and in config.

Florian Zschocke

2013-08-20 8b5730a0e32d5707b6ac6df5fb0906b7981853eb

 src/main/java/com/gitblit/models/UserModel.java

@@ -75,17 +75,21 @@
   // non-persisted fields

   public boolean isAuthenticated;

   public AccountType accountType;



   public UserPreferences userPreferences;

   

   public UserModel(String username) {

      this.username = username;

      this.isAuthenticated = true;

      this.accountType = AccountType.LOCAL;

      this.userPreferences = new UserPreferences(this.username);

   }



   private UserModel() {

      this.username = "$anonymous";

      this.isAuthenticated = false;

      this.accountType = AccountType.LOCAL;

      this.userPreferences = new UserPreferences(this.username);

   }

   

   public boolean isLocalAccount() {

@@ -269,7 +273,13 @@
   }

      

   public void setRepositoryPermission(String repository, AccessPermission permission) {

      permissions.put(repository.toLowerCase(), permission);

      if (permission == null) {

         // remove the permission

         permissions.remove(repository.toLowerCase());

      } else {

         // set the new permission

         permissions.put(repository.toLowerCase(), permission);

      }

   }



   public RegistrantAccessPermission getRepositoryPermission(RepositoryModel repository) {

@@ -602,6 +612,10 @@
      return "~" + username;

   }

   

   public UserPreferences getPreferences() {

      return userPreferences;

   }

	
   @Override

   public int hashCode() {

      return username.hashCode();