August 2013 - Franciaflex-magalie-commits - mailman.cloud.codelutin.com

r401 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com Aug. 30, 2013

Aug. 30, 2013

Author: maven-release Date: 2013-08-30 18:34:51 +0200 (Fri, 30 Aug 2013) New Revision: 401 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-08-30 16:34:44 UTC (rev 400) +++ trunk/magalie-persistence/pom.xml 2013-08-30 16:34:51 UTC (rev 401) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5</version> + <version>1.0-rc-6-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-08-30 16:34:44 UTC (rev 400) +++ trunk/magalie-services/pom.xml 2013-08-30 16:34:51 UTC (rev 401) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5</version> + <version>1.0-rc-6-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-30 16:34:44 UTC (rev 400) +++ trunk/magalie-web/pom.xml 2013-08-30 16:34:51 UTC (rev 401) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5</version> + <version>1.0-rc-6-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-30 16:34:44 UTC (rev 400) +++ trunk/pom.xml 2013-08-30 16:34:51 UTC (rev 401) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5</version> + <version>1.0-rc-6-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> </scm> <distributionManagement> <site>

1 0

r400 - in tags: . franciaflex-magalie-1.0-rc-5
by maven-release＠users.forge.codelutin.com Aug. 30, 2013

Aug. 30, 2013

Author: maven-release Date: 2013-08-30 18:34:44 +0200 (Fri, 30 Aug 2013) New Revision: 400 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] copy for tag franciaflex-magalie-1.0-rc-5 Added: tags/franciaflex-magalie-1.0-rc-5/ Property changes on: tags/franciaflex-magalie-1.0-rc-5 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr .idea *~ Added: svn:mergeinfo + /branches/magalie-eugene:191-224

1 0

r399 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com Aug. 30, 2013

Aug. 30, 2013

Author: maven-release Date: 2013-08-30 18:34:36 +0200 (Fri, 30 Aug 2013) New Revision: 399 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare release franciaflex-magalie-1.0-rc-5 Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-08-30 16:32:06 UTC (rev 398) +++ trunk/magalie-persistence/pom.xml 2013-08-30 16:34:36 UTC (rev 399) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5-SNAPSHOT</version> + <version>1.0-rc-5</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-08-30 16:32:06 UTC (rev 398) +++ trunk/magalie-services/pom.xml 2013-08-30 16:34:36 UTC (rev 399) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5-SNAPSHOT</version> + <version>1.0-rc-5</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-30 16:32:06 UTC (rev 398) +++ trunk/magalie-web/pom.xml 2013-08-30 16:34:36 UTC (rev 399) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5-SNAPSHOT</version> + <version>1.0-rc-5</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-30 16:32:06 UTC (rev 398) +++ trunk/pom.xml 2013-08-30 16:34:36 UTC (rev 399) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5-SNAPSHOT</version> + <version>1.0-rc-5</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> </scm> <distributionManagement> <site>

1 0

r398 - trunk/magalie-web
by bleny＠users.forge.codelutin.com Aug. 30, 2013

Aug. 30, 2013

Author: bleny Date: 2013-08-30 18:32:06 +0200 (Fri, 30 Aug 2013) New Revision: 398 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add missing dependency Modified: trunk/magalie-web/pom.xml Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-30 16:28:22 UTC (rev 397) +++ trunk/magalie-web/pom.xml 2013-08-30 16:32:06 UTC (rev 398) @@ -62,6 +62,11 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency>

1 0

r397 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com Aug. 30, 2013

Aug. 30, 2013

Author: bleny Date: 2013-08-30 18:28:22 +0200 (Fri, 30 Aug 2013) New Revision: 397 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3111 change message Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-08-30 16:24:14 UTC (rev 396) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-08-30 16:28:22 UTC (rev 397) @@ -70,7 +70,7 @@ } }); if (storageMovement.articleUnavailable) { - alert('Plus de stock'); + alert("Pas d'autre emplacement disponible"); } else { if (this.expectedQuantity) { storageMovement.expectedQuantity = Math.min(model.remaining(), storageMovement.storedArticle.quantity);

1 0

r396 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com Aug. 30, 2013

Aug. 30, 2013

Author: bleny Date: 2013-08-30 18:24:14 +0200 (Fri, 30 Aug 2013) New Revision: 396 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3113 'location' field in action was renamed 'receptionLocation' Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-29 12:47:46 UTC (rev 395) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-30 16:24:14 UTC (rev 396) @@ -61,13 +61,14 @@ }, async: false, success: function(data) { - location = data.location; - locations.push(location); + location = data.receptionLocation; // null si le code barre n'est pas valide } }); } if (location == null) { throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide"); + } else { + locations.push(location); } if (location.fullLocation) { throw new ValidationError("Emplt " + barcode + " en erreur - choisir un autre");

1 0

r395 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com Aug. 29, 2013

Aug. 29, 2013

Author: bleny Date: 2013-08-29 14:47:46 +0200 (Thu, 29 Aug 2013) New Revision: 395 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: prevent an exception to be logged as error, add a precondition Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 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/LocationJsonAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-08-29 11:19:42 UTC (rev 394) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-08-29 12:47:46 UTC (rev 395) @@ -69,7 +69,7 @@ } @Override - public String execute() throws InvalidMagalieBarcodeException { + public String execute() { MagalieUser magalieUser = session.getMagalieUser(); @@ -79,8 +79,18 @@ Building building = session.getBuilding(); - receptionLocation = service.getReceptionLocation(building, magalieUser, locationBarcode, articleId); + try { + receptionLocation = service.getReceptionLocation(building, magalieUser, locationBarcode, articleId); + + } catch (InvalidMagalieBarcodeException e) { + + if (log.isWarnEnabled()) { + log.warn("unable to find reception location for barcode '" + locationBarcode + "'"); + } + + } + return SUCCESS; } 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 11:19:42 UTC (rev 394) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 12:47:46 UTC (rev 395) @@ -193,6 +193,12 @@ @Override public String execute() { + if (log.isDebugEnabled()) { + log.debug("confirmation = " + confirmation); + } + + Preconditions.checkNotNull(confirmation, "absence de données de confirmation"); + if (confirmation.getStorageMovementIds().contains(null)) { if (log.isErrorEnabled()) {

1 0

r394 - trunk/magalie-services/src/main/resources
by bleny＠users.forge.codelutin.com Aug. 29, 2013

Aug. 29, 2013

Author: bleny Date: 2013-08-29 13:19:42 +0200 (Thu, 29 Aug 2013) New Revision: 394 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: reverted a change in the fixtures made in #392 : commited by error Modified: trunk/magalie-services/src/main/resources/fixtures.yaml Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-29 11:18:09 UTC (rev 393) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-29 11:19:42 UTC (rev 394) @@ -623,8 +623,8 @@ &requestedList1 !requested-list id: requestedList1 code: 123456789 - requestDate: 2013-06-08 12:00:00 - urgent: false + requestDate: 2013-04-08 12:00:00 + urgent: true building: *B1 listType: LOT DE FAB @@ -633,7 +633,7 @@ id: requestedList2 code: 987654321 requestDate: 2013-04-08 12:00:00 - urgent: true + urgent: false building: *B1 listType: LOT DE FAB

1 0

r393 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com Aug. 29, 2013

Aug. 29, 2013

Author: bleny Date: 2013-08-29 13:18:09 +0200 (Thu, 29 Aug 2013) New Revision: 393 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3112 hide messages that duplicate the message in service notifications Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 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/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-29 10:48:01 UTC (rev 392) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-29 11:18:09 UTC (rev 393) @@ -43,7 +43,8 @@ import java.util.List; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "withdraw-item!input", "requestedArticleId", "${requestedArticleId}" }) + @Result(name="success", type="redirectAction", params = { "actionName", "withdraw-item!input", "requestedArticleId", "${requestedArticleId}" }), + @Result(name="choose-list-type", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }) }) public class DeliverRequestedArticleAction extends MagalieActionSupport implements Preparable { @@ -107,6 +108,12 @@ this.listType = listType; } + /** + * On arrive ici quand l'utilisateur a sélectionné un type de liste. On cherche + * quelque-chose à faire et si on trouve ou redirige vers l'interface de prélèvement + * sinon on reste sur la liste des types de listes en affichant un message expliquant + * pourquoi on est pas allé plus loin + */ @Override public String execute() { @@ -157,6 +164,44 @@ } + /** + * On arrive ici après avoir terminer de prélever un article. On redirige vers l'article + * suivant s'il y en a un sinon on propose directement de changer le type de liste. + * + * On affiche pas de message particulier, l'utilisateur a déjà été notifié qu'il n'est + * plus affecté à la liste + */ + public String next() { + + Preconditions.checkState(listType != null); + + session.setActivity(Activity.REQUESTED_LISTS); + + MagalieUser magalieUser = session.getMagalieUser(); + + Building building = session.getBuilding(); + + FindOrderToExecuteResult findOrderToExecuteResult = + service.findOrderToExecute(magalieUser, building, listType); + + String result; + + if (findOrderToExecuteResult.isSuccess()) { + + requestedArticle = findOrderToExecuteResult.getRequestedArticle(); + + result = SUCCESS; + + } else { + + result = "choose-list-type"; + + } + + return result; + + } + public String getRequestedArticleId() { return requestedArticle.getId(); } 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 10:48:01 UTC (rev 392) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 11:18:09 UTC (rev 393) @@ -48,7 +48,7 @@ @Results({ @Result(name="KANBANS", type="redirectAction", params = { "actionName", "fulfil-kanban!input" }), - @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article", "listType", "%{listType}" }), + @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article!next", "listType", "%{listType}" }), @Result(name="REQUESTED_LISTS_CANCEL", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }) }) public class WithdrawItemAction extends MagalieActionSupport implements Preparable {

1 0

r392 - in trunk: magalie-services/src/main/resources magalie-web/src/main/java/com/franciaflex/magalie/web magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com Aug. 29, 2013

Aug. 29, 2013

Author: bleny Date: 2013-08-29 12:48:01 +0200 (Thu, 29 Aug 2013) New Revision: 392 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove messages from session and use notification context because notifications was lost in case of two redirections Modified: trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-29 10:48:01 UTC (rev 392) @@ -623,8 +623,8 @@ &requestedList1 !requested-list id: requestedList1 code: 123456789 - requestDate: 2013-04-08 12:00:00 - urgent: true + requestDate: 2013-06-08 12:00:00 + urgent: false building: *B1 listType: LOT DE FAB @@ -633,7 +633,7 @@ id: requestedList2 code: 987654321 requestDate: 2013-04-08 12:00:00 - urgent: false + urgent: true building: *B1 listType: LOT DE FAB Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-08-29 10:48:01 UTC (rev 392) @@ -24,12 +24,15 @@ */ import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.ActionSupport; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.Arrays; import java.util.List; +import java.util.Set; public class MagalieActionSupport extends ActionSupport { @@ -41,12 +44,14 @@ "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z" }); + protected Set<String> messages; + public List<String> getShortcuts () { return SHORTCUTS; } public boolean isWithMessages() { - return super.hasActionErrors() || super.hasActionMessages(); + return super.hasActionErrors() || super.hasActionMessages() || CollectionUtils.isNotEmpty(messages); } @Override @@ -54,4 +59,18 @@ return Objects.toStringHelper(this).toString(); } + public Set<String> getMessages() { + ImmutableSet<String> messages = ImmutableSet.copyOf(this.messages); + this.messages.clear(); + return messages; + } + + public void setMessages(Set<String> messages) { + this.messages = messages; + } + + protected void addMessage(String message) { + messages.add(message); + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-08-29 10:48:01 UTC (rev 392) @@ -34,7 +34,6 @@ import com.franciaflex.magalie.web.action.RestoreFixturesAction; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; import org.apache.commons.logging.Log; @@ -78,18 +77,10 @@ if (action instanceof MagalieActionSupport) { - // on ajoute les notifications pour l'utilisateur - - Set<String> messages = Sets.newLinkedHashSet(); - - // d'abord on récupère les notifications ajoutées par les actions dans la session - MagalieSession magalieSession = getMagalieSession(invocation); - messages.addAll(magalieSession.getMessagesAndClear()); + // on ajoute les notifications - // ensuite on ajoute les notifications ajoutées par les services - MagalieApplicationContext magalieApplicationContext = getMagalieApplicationContext(invocation); @@ -100,18 +91,10 @@ if (magalieUser != null) { - messages.addAll(userNotificationContext.getMessagesAndClearFor(magalieUser)); + ((MagalieActionSupport) action).setMessages(userNotificationContext.getMessages(magalieUser)); } - // on ajoute tous ces messages comme actionMessage - - for (String message : messages) { - - ((MagalieActionSupport) action).addActionMessage(message); - - } - Class<?> actionClass = action.getClass(); Set<PropertyDescriptor> descriptors = Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-08-29 10:48:01 UTC (rev 392) @@ -33,7 +33,6 @@ import java.io.Serializable; import java.util.Collection; -import java.util.List; /** * The single object every user will have in its session. @@ -88,16 +87,6 @@ this.lastUsedDestinationWarehouseForKanbans = lastUsedDestinationWarehouseForKanbans; } - public void addMessage(String message) { - messages.add(message); - } - - public List<String> getMessagesAndClear() { - List<String> messages = Lists.newArrayList(this.messages); - this.messages.clear(); - return messages; - } - public Activity getActivity() { return activity; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-29 10:48:01 UTC (rev 392) @@ -81,8 +81,8 @@ return usersNotifications; } - public Set<String> getMessagesAndClearFor(MagalieUser magalieUser) { - return usersNotifications.removeAll(magalieUser); + public Set<String> getMessages(MagalieUser magalieUser) { + return usersNotifications.get(magalieUser); } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -133,19 +133,19 @@ if (findOrderToExecuteResult.isNothingToDo()) { - addActionMessage("Il n'y a aucune demande. Vous n'avez rien à faire"); + addMessage("Il n'y a aucune demande. Vous n'avez rien à faire"); } if (findOrderToExecuteResult.isDriverLicenseRequired()) { - addActionMessage("Il y a des demandes en cours, mais un permis est requis"); + addMessage("Il y a des demandes en cours, mais un permis est requis"); } if (findOrderToExecuteResult.isEverythingUnavailable()) { - addActionMessage("Toutes les demandes en cours concernent des articles indisponibles"); + addMessage("Toutes les demandes en cours concernent des articles indisponibles"); } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -113,7 +113,7 @@ } catch (PreparedArticleReceptionAlreadyStoredException e) { - session.addMessage("Article déjà rangé"); + addMessage("Article déjà rangé"); log.warn("should never occur", e); @@ -121,7 +121,7 @@ } catch (InvalidMagalieBarcodeException e) { - session.addMessage("Le code n'est pas valide"); + addMessage("Le code n'est pas valide"); log.warn("should never occur", e); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -51,7 +51,7 @@ service.cleanDatabaseAndLoadFixtures("fixtures"); - session.addMessage("Jeu de données initial restauré"); + addMessage("Jeu de données initial restauré"); return SUCCESS; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -100,13 +100,13 @@ log.error("should never occur, barcode is validated before arriving in this action", e); - session.addMessage("Le code barre " + articleBarcode + " n'est pas un code valide"); + addMessage("Le code barre " + articleBarcode + " n'est pas un code valide"); return ERROR; } catch (IllegalWithdrawException e) { - session.addMessage("Cet article ne peut pas être prélevé avec cette méthode"); + addMessage("Cet article ne peut pas être prélevé avec cette méthode"); return ERROR; @@ -114,7 +114,7 @@ if (simpleWithdrawItemTask.isDriverLicenseRequired()) { - session.addMessage("Un permis est requis pour accéder à cet article"); + addMessage("Un permis est requis pour accéder à cet article"); return ERROR; @@ -122,7 +122,7 @@ if (simpleWithdrawItemTask.isArticleUnavailable()) { - session.addMessage("Cet article n'est pas disponible"); + addMessage("Cet article n'est pas disponible"); return ERROR; 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-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -250,7 +250,7 @@ locationErrorsService.reportError(storedArticleId, magalieUser); - session.addMessage("L'emplacement a bien été reporté en erreur"); + addMessage("L'emplacement a bien été reporté en erreur"); return ERROR; Modified: trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-08-29 10:48:01 UTC (rev 392) @@ -50,6 +50,9 @@ <s:iterator value="actionErrors" var="actionError" > alert('<s:property value="#actionError" escapeJavaScript="true" escapeHtml="false"/>'); </s:iterator> + <s:iterator value="messages" var="message" > + alert('<s:property value="#message" escapeJavaScript="true" escapeHtml="false"/>'); + </s:iterator> }); </script> </s:if>

1 0