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 c23a182ef0a557bd07cf207e98021b57323ae354 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Mar 31 12:12:18 2015 +0200 Pas besoin de surcharger input() juste pour appeller super, on définit les @Result en haut de l'action (comme dans le reste de l'appli), aucune raison d'avoir à catcher une NoRoleAttributedException à ce moment --- .../authentication/ForgottenPasswordAction.java | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java index e3cb2ec..ce49700 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java @@ -1,16 +1,18 @@ package fr.ifremer.wao.web.action.authentication; import fr.ifremer.wao.services.service.administration.InactiveWaoUserException; -import fr.ifremer.wao.services.service.administration.NoRoleAttributedException; import fr.ifremer.wao.services.service.administration.WaoUsersService; import fr.ifremer.wao.services.service.administration.WrongCredentialsException; import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; /** - * Created by davidcosse on 26/03/15. + * @since 5.1.2 */ +@Results({ + @Result(name="success", type="redirectAction", params = { "namespace", "/authentication", "actionName", "forgotten-password!input", "recovered", "%{recovered}", "login", "%{login}"}) +}) public class ForgottenPasswordAction extends WaoJspActionSupport { private static final long serialVersionUID = 1L; @@ -26,15 +28,8 @@ public class ForgottenPasswordAction extends WaoJspActionSupport { } @Override - @Action("forgotten-password-input") - public String input() throws Exception { - return super.input(); - } + public String execute() { - @Override - @Action(results = { - @Result(name="success", type="redirectAction", params = { "namespace", "/authentication", "actionName", "forgotten-password!input", "recovered", "%{recovered}", "login", "%{login}"})}) - public String execute() throws Exception { try { service.askForPasswordReminder(login); recovered = true; @@ -43,9 +38,6 @@ public class ForgottenPasswordAction extends WaoJspActionSupport { addFieldError("login", t("wao.ui.form.authentication.error.wrongCredentials")); return INPUT; } catch (InactiveWaoUserException inactiveWaoUserException) { - addFieldError("login", t("wao.ui.form.authentication.error.noRoleAttributed")); - return INPUT; - } catch (NoRoleAttributedException noRoleAttributedException) { addFieldError("login", t("wao.ui.form.authentication.error.inactiveWaoUser")); return INPUT; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.