Author: Bavencoff Date: 2013-05-23 09:19:13 +0200 (Thu, 23 May 2013) New Revision: 183 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2454 : Cancel mouvement order Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-22 16:04:44 UTC (rev 182) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-23 07:19:13 UTC (rev 183) @@ -53,7 +53,7 @@ <s:url namespace="/" action="withdraw-item!cancel" id="cancelUrl" > <s:param name="storageMovementOrderId" value="%{storageMovementOrderId}" /> </s:url> - <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink" >Abandonner (Esc)</s:a> + <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink" >Quitter (Esc)</s:a> <input type="button" id="reportError" value="Anomalie (F5)" class="btn btn-danger btn-small" /> <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-22 16:04:44 UTC (rev 182) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-23 07:19:13 UTC (rev 183) @@ -263,10 +263,6 @@ } }, - onCancel : function() { - - }, - }; // bindings @@ -276,6 +272,6 @@ $('#reportCancel').click(controller.onCancel); $('#withdraw-item_next').click(controller.onNext); bindKey('F5', controller.onReportError); - bindKey('Esc', controller.onCancel); + bindKey('Esc', function(){ redirectTo($('#cancelLink'));}); view.refresh(); });