Author: bleny Date: 2013-07-22 16:45:04 +0200 (Mon, 22 Jul 2013) New Revision: 318 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: in storage transfer, fix bug 'quantity' value was erased Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-22 14:34:23 UTC (rev 317) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-22 14:45:04 UTC (rev 318) @@ -110,8 +110,6 @@ storedArticle = Iterables.find(storedArticles, JpaEntities.entityHasId(storedArticleId)); - quantity = storedArticle.getQuantity(); - } Company company = session.getBuilding().getCompany(); @@ -125,6 +123,11 @@ prepare(); + // default value + if (storedArticle != null) { + quantity = storedArticle.getQuantity(); + } + return INPUT; } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-22 14:34:23 UTC (rev 317) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-22 14:45:04 UTC (rev 318) @@ -99,7 +99,7 @@ <s:hidden name="originId" value="%{origin.id}" /> <s:hidden name="storedArticleId" value="%{storedArticle.id}" /> - <s:textfield name="quantity" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> + <s:textfield name="quantity" value="%{quantity}" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> <s:select label="Bât. dest." key="destinationBuildingId"