Author: bleny Date: 2013-08-19 17:43:42 +0200 (Mon, 19 Aug 2013) New Revision: 366 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #3000 change redirection after remove affectation Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-08-19 14:30:14 UTC (rev 365) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-08-19 15:43:42 UTC (rev 366) @@ -27,11 +27,13 @@ import com.franciaflex.magalie.services.service.RequestedArticleService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Preconditions; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "choose-activity" }) + @Result(name="REDIRECT_TO_LIST_TYPES", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }), + @Result(name="REDIRECT_TO_ACTIVITIES", type="redirectAction", params = { "actionName", "choose-activity" }) }) public class RemoveUserAffectationAction extends MagalieActionSupport { @@ -39,6 +41,8 @@ protected RequestedArticleService service; + protected String result; + public void setSession(MagalieSession session) { this.session = session; } @@ -47,14 +51,20 @@ this.service = service; } + public void setResult(String result) { + this.result = result; + } + @Override public String execute() { + Preconditions.checkState(result != null); + MagalieUser magalieUser = session.getMagalieUser(); service.removeAffectation(magalieUser); - return SUCCESS; + return result; } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-19 14:30:14 UTC (rev 365) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-19 15:43:42 UTC (rev 366) @@ -39,6 +39,11 @@ <s:param name="listType" value="%{requestedList.listType}" /> </s:url> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="requestedArticle" >Demander un article à servir (0)</s:a> + + <s:url action="remove-user-affectation" id="removeUserAffectationUrl"> + <s:param name="result">REDIRECT_TO_LIST_TYPES</s:param> + </s:url> + <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Abandonner la liste (Esc)</s:a> </s:if> <s:else> <s:iterator value="listTypes" var="listType" status="stat"> @@ -64,7 +69,9 @@ </s:a> </s:else> </s:iterator> + + <s:url action="remove-user-affectation" id="removeUserAffectationUrl"> + <s:param name="result">REDIRECT_TO_ACTIVITIES</s:param> + </s:url> + <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Changer d'activité (Esc)</s:a> </s:else> - -<s:url action="remove-user-affectation" id="removeUserAffectationUrl"/> -<s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Changer d'activité (Esc)</s:a>