From f58cbd6f320f9998a7f94203e2513d440cea6f2b Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 17 Dec 2012 14:19:50 +0100
Subject: [PATCH] Bug #1596: Disable confirm close message if user uses back
 button

FEA: ItEr77S04BugFixing
---
 .../main/java/org/libreplan/web/orders/OrderCRUDController.java | 2 ++
 .../org/libreplan/web/planner/order/OrderPlanningModel.java     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index 3c0bb186f..1bbcb1a79 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -50,6 +50,7 @@ import org.libreplan.business.orders.entities.OrderStatusEnum;
 import org.libreplan.business.planner.entities.PositionConstraintType;
 import org.libreplan.business.templates.entities.OrderTemplate;
 import org.libreplan.business.users.entities.UserRole;
+import org.libreplan.web.common.ConfirmCloseUtil;
 import org.libreplan.web.common.IMessagesForUser;
 import org.libreplan.web.common.Level;
 import org.libreplan.web.common.MessagesForUser;
@@ -241,6 +242,7 @@ public class OrderCRUDController extends GenericForwardComposer {
                                                         throws InterruptedException {
                                                     if (evt.getName().equals(
                                                             "onOK")) {
+                                                        ConfirmCloseUtil.resetConfirmClose();
                                                         Executions
                                                                 .sendRedirect("/planner/index.zul;company_scheduling");
                                                     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
index 674ca3b93..910b561a8 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
@@ -70,6 +70,7 @@ import org.libreplan.business.users.entities.User;
 import org.libreplan.business.users.entities.UserRole;
 import org.libreplan.business.workingday.EffortDuration;
 import org.libreplan.web.calendars.BaseCalendarModel;
+import org.libreplan.web.common.ConfirmCloseUtil;
 import org.libreplan.web.common.ViewSwitcher;
 import org.libreplan.web.planner.adaptplanning.IAdaptPlanningCommand;
 import org.libreplan.web.planner.advances.AdvanceAssignmentPlanningController;
@@ -1102,6 +1103,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
                                 public void onEvent(Event evt)
                                         throws InterruptedException {
                                     if (evt.getName().equals("onOK")) {
+                                        ConfirmCloseUtil.resetConfirmClose();
                                         Executions
                                                 .sendRedirect("/planner/index.zul;company_scheduling");
                                     }