Author: bleny Date: 2014-04-18 12:02:33 +0200 (Fri, 18 Apr 2014) New Revision: 1899 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1899 Log: refs #4560 remove KEEP_SAME_PASSWORD from available strategies for user creation Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-04-18 10:02:33 UTC (rev 1899) @@ -22,6 +22,7 @@ */ import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.UserProfile; @@ -55,6 +56,8 @@ */ protected String canReadBoats; + protected ImmutableSet<UpdateWaoUserCommandPasswordStrategy> passwordStrategies; + public String getCanReadBoats() { return canReadBoats; } @@ -215,6 +218,14 @@ this.passwordStrategy = passwordStrategy; } + public ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getPasswordStrategies() { + return passwordStrategies; + } + + public void setPasswordStrategies(ImmutableSet<UpdateWaoUserCommandPasswordStrategy> passwordStrategies) { + this.passwordStrategies = passwordStrategies; + } + public String getClearPassword() { return clearPassword; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java 2014-04-18 10:02:33 UTC (rev 1899) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.collect.ImmutableSet; import org.nuiton.i18n.I18n; public enum UpdateWaoUserCommandPasswordStrategy { @@ -31,6 +32,13 @@ DEFINE_PASSWORD(I18n.n("UpdateWaoUserCommandPasswordStrategy.DEFINE_PASSWORD")); + /** C'est une création donc on ne permet pas de « conserver le mot de passe ». */ + protected static final ImmutableSet<UpdateWaoUserCommandPasswordStrategy> PASSWORD_STRATEGIES_FOR_WAO_USER_CREATION = ImmutableSet.of( + UpdateWaoUserCommandPasswordStrategy.DEFINE_PASSWORD, + UpdateWaoUserCommandPasswordStrategy.GENERATE_NEW_PASSWORD); + + protected static final ImmutableSet<UpdateWaoUserCommandPasswordStrategy> PASSWORD_STRATEGIES_FOR_WAO_USER_UPDATE = ImmutableSet.copyOf(values()); + protected String i18nKey; UpdateWaoUserCommandPasswordStrategy(String i18nKey) { @@ -48,4 +56,12 @@ public boolean isGeneratePassword() { return this == GENERATE_NEW_PASSWORD; } + + public static ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getPasswordStrategiesForWaoUserCreation() { + return PASSWORD_STRATEGIES_FOR_WAO_USER_CREATION; + } + + public static ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getPasswordStrategiesForWaoUserUpdate() { + return PASSWORD_STRATEGIES_FOR_WAO_USER_UPDATE; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-04-18 10:02:33 UTC (rev 1899) @@ -130,6 +130,8 @@ updateWaoUserCommand.setPasswordStrategy(UpdateWaoUserCommandPasswordStrategy.KEEP_SAME_PASSWORD); + updateWaoUserCommand.setPasswordStrategies(UpdateWaoUserCommandPasswordStrategy.getPasswordStrategiesForWaoUserUpdate()); + if (waoUser.isCanReadBoatsNotEmpty()) { String canReadBoats = Boats.toImmatriculations(waoUser.getCanReadBoats()); @@ -144,6 +146,8 @@ updateWaoUserCommand.setPasswordStrategy(UpdateWaoUserCommandPasswordStrategy.GENERATE_NEW_PASSWORD); + updateWaoUserCommand.setPasswordStrategies(UpdateWaoUserCommandPasswordStrategy.getPasswordStrategiesForWaoUserCreation()); + } return updateWaoUserCommand; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-04-18 10:02:33 UTC (rev 1899) @@ -134,9 +134,4 @@ return updateWaoUserCommand; } - // FIXME brendan 17/04/14 création - public ImmutableSet<UpdateWaoUserCommandPasswordStrategy> getUpdateWaoUserCommandPasswordStrategies() { - return ImmutableSet.copyOf(UpdateWaoUserCommandPasswordStrategy.values()); - } - } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-04-18 09:52:55 UTC (rev 1898) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-04-18 10:02:33 UTC (rev 1899) @@ -116,7 +116,7 @@ <s:radio name="updateWaoUserCommand.passwordStrategy" label="%{getText('wao.ui.form.updateWaoUserCommand.passwordStrategy')}" listValue="%{getText(top.i18nKey)}" - list="updateWaoUserCommandPasswordStrategies" + list="updateWaoUserCommand.passwordStrategies" requiredLabel="true" /> <div id="definePassword">