Author: bleny Date: 2013-08-29 11:43:16 +0200 (Thu, 29 Aug 2013) New Revision: 391 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #3115 don't break workflow, execute result must send to another article Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 08:46:25 UTC (rev 390) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 09:43:16 UTC (rev 391) @@ -30,6 +30,7 @@ import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.franciaflex.magalie.services.service.ArticleStorageService; import com.franciaflex.magalie.services.service.RequestedArticleService; +import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; import com.google.common.base.Preconditions; @@ -47,7 +48,8 @@ @Results({ @Result(name="KANBANS", type="redirectAction", params = { "actionName", "fulfil-kanban!input" }), - @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article!input", "listType", "%{listType}" }) + @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article", "listType", "%{listType}" }), + @Result(name="REQUESTED_LISTS_CANCEL", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }) }) public class WithdrawItemAction extends MagalieActionSupport implements Preparable { @@ -232,6 +234,12 @@ String resultName = session.getActivity().name(); + if (Activity.REQUESTED_LISTS.equals(session.getActivity())) { + + resultName = "REQUESTED_LISTS_CANCEL"; + + } + return resultName; }