From 4c32d395b5a17564165dfdc7ccff32e4035872cd Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Wed, 4 May 2011 12:45:21 +0200 Subject: [PATCH] [Bug #1000] it marks OrderModel with @OnConcurrentModification to intercept an OptimisticLockingFailureException. FEA: ItEr74S04BugFixing --- .../src/main/java/org/navalplanner/web/orders/OrderModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java index 860e63447..f94f2bd1a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java @@ -85,6 +85,7 @@ import org.navalplanner.business.users.entities.OrderAuthorizationType; import org.navalplanner.business.users.entities.User; import org.navalplanner.business.users.entities.UserRole; import org.navalplanner.web.common.IntegrationEntityModel; +import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification; import org.navalplanner.web.orders.labels.LabelsOnConversation; import org.navalplanner.web.security.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -103,6 +104,7 @@ import org.zkoss.zul.Messagebox; */ @Service @Scope(BeanDefinition.SCOPE_PROTOTYPE) +@OnConcurrentModification(goToPage = "/planner/index.zul;orders_list") public class OrderModel extends IntegrationEntityModel implements IOrderModel { @Autowired