Author: bleny Date: 2013-08-29 10:34:26 +0200 (Thu, 29 Aug 2013) New Revision: 388 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fixes #3114 add parameter to redirect on articles for the same supplier on cancel Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-08-28 09:33:07 UTC (rev 387) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-08-29 08:34:26 UTC (rev 388) @@ -59,7 +59,9 @@ <s:hidden name="confirmation" /> <div style="width: 180px"> - <s:url action="receive-article!cancel" id="cancelUrl" /> + <s:url action="receive-article!cancel" id="cancelUrl"> + <s:param name="supplierId" value="%{supplierId}" /> + </s:url> <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink">Abandon (Esc)</s:a> <input type="button" name="full" value="Plein (F5)" class="btn btn-danger btn-mini" id="receive-article_full" /> <s:submit name="next" value="Suivant (⏎)" cssClass="btn btn-primary btn-mini" />