Author: bleny Date: 2013-06-05 13:27:23 +0200 (Wed, 05 Jun 2013) New Revision: 238 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fix exception in UI at logout Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java 2013-06-05 11:23:31 UTC (rev 237) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java 2013-06-05 11:27:23 UTC (rev 238) @@ -29,12 +29,14 @@ import org.apache.struts2.convention.annotation.Results; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "login!input" }) + @Result(name="success", type="redirectAction", params = { "actionName", "login!input", "companyId", "${companyId}" }) }) public class LogoutAction extends MagalieActionSupport { protected MagalieSession session; + protected String companyId; + public void setSession(MagalieSession session) { this.session = session; } @@ -42,6 +44,8 @@ @Override public String execute() { + companyId = session.getMagalieUser().getCompany().getId(); + session.setMagalieUser(null); session.setBuilding(null); @@ -49,4 +53,9 @@ return SUCCESS; } + + public String getCompanyId() { + return companyId; + } + }