Author: bleny Date: 2013-07-23 13:50:57 +0200 (Tue, 23 Jul 2013) New Revision: 321 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fix unable to restore fixtures from report Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-22 15:06:42 UTC (rev 320) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-23 11:50:57 UTC (rev 321) @@ -30,6 +30,7 @@ import com.franciaflex.magalie.web.action.IndexAction; import com.franciaflex.magalie.web.action.LoginAction; import com.franciaflex.magalie.web.action.ReportAction; +import com.franciaflex.magalie.web.action.RestoreFixturesAction; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.ActionInvocation; @@ -52,7 +53,12 @@ public class MagalieInterceptor implements Interceptor { public static final ImmutableSet<Class<? extends MagalieActionSupport>> ACCESSIBLE_ACTIONS_FOR_NOT_LOGGED_USER = - ImmutableSet.of(LoginAction.class, IndexAction.class, ChooseCompanyAction.class, ReportAction.class); + ImmutableSet.of( + LoginAction.class, + IndexAction.class, + ChooseCompanyAction.class, + ReportAction.class, + RestoreFixturesAction.class); private static final Log log = LogFactory.getLog(MagalieInterceptor.class); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-07-22 15:06:42 UTC (rev 320) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-07-23 11:50:57 UTC (rev 321) @@ -25,6 +25,7 @@ import com.franciaflex.magalie.services.service.FixturesService; import com.franciaflex.magalie.web.MagalieActionSupport; +import com.franciaflex.magalie.web.MagalieSession; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -35,16 +36,22 @@ protected FixturesService service; + protected MagalieSession session; + public void setService(FixturesService service) { this.service = service; } + public void setSession(MagalieSession session) { + this.session = session; + } + @Override public String execute() { service.cleanDatabaseAndLoadFixtures("fixtures"); - addActionMessage("Jeu de données initial restauré"); + session.addMessage("Jeu de données initial restauré"); return SUCCESS;