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 88c7397645a89eed055aa08c0fe0e8142ca9f767 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:20:19 2015 +0100 Quand on enregistre le formulaire de modification d'un utilsateur, on doit retourner vers la liste des utilisateurs de la société (fixes #6534) --- .../fr/ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 8367e62..5c161ee 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 @@ -71,6 +71,8 @@ public class EditWaoUserAction extends WaoJspActionSupport implements Preparable updateWaoUserCommand = service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId, optionalOrganisationId); + setOrganisationId(updateWaoUserCommand.getWaoUser().getOrganisation().getCompany().getTopiaId()); + } @Override @@ -115,7 +117,7 @@ public class EditWaoUserAction extends WaoJspActionSupport implements Preparable session.addMessage(t("wao.ui.form.updateWaoUserCommand.success", updateWaoUserCommand.getWaoUser().getLogin())); // for redirection - setOrganisationId(updateWaoUserCommand.getWaoUser().getOrganisation().getTopiaId()); + setOrganisationId(updateWaoUserCommand.getWaoUser().getOrganisation().getCompany().getTopiaId()); String result; if (getAuthenticatedWaoUser().isAuthorizedToViewCompanyUsers()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.