Displayname and email address persistence for ConfigUserService

James Moger

2012-04-25 fdefa2b1fd7e3a4349a4ee72599f5d390166be30

 src/com/gitblit/ConfigUserService.java

@@ -61,6 +61,10 @@


   private static final String PASSWORD = "password";



   private static final String DISPLAYNAME = "displayName";

	
   private static final String EMAILADDRESS = "emailAddress";



   private static final String REPOSITORY = "repository";



   private static final String ROLE = "role";

@@ -689,6 +693,12 @@
         if (!StringUtils.isEmpty(model.password)) {

            config.setString(USER, model.username, PASSWORD, model.password);

         }

         if (!StringUtils.isEmpty(model.displayName)) {

            config.setString(USER, model.username, DISPLAYNAME, model.displayName);

         }

         if (!StringUtils.isEmpty(model.emailAddress)) {

            config.setString(USER, model.username, EMAILADDRESS, model.emailAddress);

         }



         // user roles

         List<String> roles = new ArrayList<String>();

@@ -786,6 +796,8 @@
            for (String username : usernames) {

               UserModel user = new UserModel(username.toLowerCase());

               user.password = config.getString(USER, username, PASSWORD);

               user.displayName = config.getString(USER, username, DISPLAYNAME);

               user.emailAddress = config.getString(USER, username, EMAILADDRESS);



               // user roles

               Set<String> roles = new HashSet<String>(Arrays.asList(config.getStringList(