From: Roland Häder Date: Tue, 2 Aug 2016 08:42:08 +0000 (+0200) Subject: Continued a bit: (please cherry-pick) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4ad9a3698d5c173fa662bc4093eae98a7d988767;p=jjobs-war.git Continued a bit: (please cherry-pick) - sorted members - cleared also new flag in clear() method - set flag before the user instance is being submitted to EJB --- diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index 0917b12e..c42f3f23 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -342,8 +342,9 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J 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) { @@ -362,23 +363,23 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J } @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 @@ -417,6 +418,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J this.setUserName(null); this.setUserPassword(null); this.setUserPasswordRepeat(null); + this.setUserMustChangePassword(null); } /**