]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Continued a bit: (please cherry-pick)
authorRoland Häder <roland@mxchange.org>
Tue, 2 Aug 2016 08:42:08 +0000 (10:42 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 6 Aug 2016 19:40:25 +0000 (21:40 +0200)
- sorted members
- cleared also new flag in clear() method
- set flag before the user instance is being submitted to EJB

src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java

index 14c5ca597346528f2c7e5032a788a793ee56ce45..48c4bcba5592b61dd700016dce30d3d30dd263bb 100644 (file)
@@ -351,8 +351,9 @@ public class PizzaAdminUserWebRequestBean extends BasePizzaController implements
                        encryptedPassword = UserUtils.encryptPassword(this.getUserPassword());
                }
 
-               // Set user name
+               // Set user name and flag
                user.setUserName(this.getUserName());
+               user.setUserMustChangePassword(this.getUserMustChangePassword());
 
                // Is a password set?
                if (encryptedPassword != null) {
@@ -371,23 +372,23 @@ public class PizzaAdminUserWebRequestBean extends BasePizzaController implements
        }
 
        @Override
-       public String getUserName () {
-               return this.userName;
+       public Boolean getUserMustChangePassword () {
+               return this.userMustChangePassword;
        }
 
        @Override
-       public void setUserName (final String userName) {
-               this.userName = userName;
+       public void setUserMustChangePassword (final Boolean userMustChangePassword) {
+               this.userMustChangePassword = userMustChangePassword;
        }
 
        @Override
-       public Boolean getUserMustChangePassword () {
-               return this.userMustChangePassword;
+       public String getUserName () {
+               return this.userName;
        }
 
        @Override
-       public void setUserMustChangePassword (final Boolean userMustChangePassword) {
-               this.userMustChangePassword = userMustChangePassword;
+       public void setUserName (final String userName) {
+               this.userName = userName;
        }
 
        @Override
@@ -426,6 +427,7 @@ public class PizzaAdminUserWebRequestBean extends BasePizzaController implements
                this.setUserName(null);
                this.setUserPassword(null);
                this.setUserPasswordRepeat(null);
+               this.setUserMustChangePassword(null);
        }
 
        /**