[wao] branch develop updated (b777525 -> 30ff5e9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from b777525 Fusion de la branche 6049 dans develop new 68ae88c On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) new 30ff5e9 Fusion de la branche 6052 dans develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 30ff5e9ce7250b4aa8e52c4cae8fe93efc5c2853 Merge: b777525 68ae88c Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:37:30 2014 +0100 Fusion de la branche 6052 dans develop commit 68ae88cf5b124ebaacab80c503c0727e636e9db7 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:36:23 2014 +0100 On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) Summary of changes: .../fr/ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 ++++ wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 1 + 3 files changed, 6 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 68ae88cf5b124ebaacab80c503c0727e636e9db7 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:36:23 2014 +0100 On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) --- .../fr/ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 ++++ wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 1 + 3 files changed, 6 insertions(+) diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java index e1089e6..5787d14 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java @@ -99,6 +99,10 @@ public class EditWaoUserAction extends WaoJspActionSupport implements Preparable addFieldError("updateWaoUserCommand.companyId", t("wao.ui.form.updateWaoUserCommand.requiredCompany")); } + if ( ! updateWaoUserCommand.getWaoUser().isActive() && updateWaoUserCommand.getPasswordStrategy().isGeneratePassword()) { + addFieldError("updateWaoUserCommand.passwordStrategy", t("wao.ui.form.updateWaoUserCommand.illegalPasswordStrategyForInactiveUser")); + } + } @Override diff --git a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties index 4a8da23..e1020e5 100644 --- a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties +++ b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties @@ -387,6 +387,7 @@ wao.ui.form.updateWaoUserCommand.coordinatorReadOnly=Coordinator (read-only) wao.ui.form.updateWaoUserCommand.error.loginMustBeUnique=Login must be unique on the system wao.ui.form.updateWaoUserCommand.guest=Guest wao.ui.form.updateWaoUserCommand.guestReadOnly=Guest (read-only) +wao.ui.form.updateWaoUserCommand.illegalPasswordStrategyForInactiveUser=If user is not active, you can't choose this password option wao.ui.form.updateWaoUserCommand.loginMustBeEmail=The login must be a valid email address wao.ui.form.updateWaoUserCommand.missingPassword=The password is missing wao.ui.form.updateWaoUserCommand.observer=Observer diff --git a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties index e74ca09..ff1b2cc 100644 --- a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties +++ b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties @@ -388,6 +388,7 @@ wao.ui.form.updateWaoUserCommand.coordinatorReadOnly=Coordinateur (lecture seule wao.ui.form.updateWaoUserCommand.error.loginMustBeUnique=L'identifiant doit être unique au sein du système wao.ui.form.updateWaoUserCommand.guest=Invité wao.ui.form.updateWaoUserCommand.guestReadOnly=Invité (lecture seule) +wao.ui.form.updateWaoUserCommand.illegalPasswordStrategyForInactiveUser=Si l'utilisateur est inactif, vous ne pouvez choisir cette option pour le mot de passe wao.ui.form.updateWaoUserCommand.loginMustBeEmail=Il faut utiliser un email valide comme identifiant wao.ui.form.updateWaoUserCommand.missingPassword=Il faut renseigner un mot de passe wao.ui.form.updateWaoUserCommand.observer=Observateur -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 30ff5e9ce7250b4aa8e52c4cae8fe93efc5c2853 Merge: b777525 68ae88c Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 12:37:30 2014 +0100 Fusion de la branche 6052 dans develop .../fr/ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 ++++ wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 1 + 3 files changed, 6 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm