From ad511c51d3e23a006b4f6371a180436789035be8 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 31 Oct 2011 13:19:27 +0100 Subject: [PATCH] [Bug #1228] Fix issue creating default write authorization When user closes the project creation pop-up with accept, before saving the default write authorization is created now re-using the previous code. FEA: ItEr75S04BugFixing --- .../java/org/libreplan/web/orders/OrderCRUDController.java | 1 + .../libreplan/web/planner/order/PlanningStateCreator.java | 6 ++++++ .../org/libreplan/web/planner/order/SaveCommandBuilder.java | 1 + 3 files changed, 8 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 61af83208..e66763d7b 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 @@ -1103,6 +1103,7 @@ public class OrderCRUDController extends GenericForwardComposer { editNewCreatedOrder(); // close project details window detailsWindow.setVisible(false); + setupOrderAuthorizationController(); saveAndContinue(false); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java index 792eb5d46..2556c5972 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/PlanningStateCreator.java @@ -1044,6 +1044,12 @@ public class PlanningStateCreator { orderAuthorizationsRemoval.add(orderAuthorization); } } + + public void cleanOrderAuthorizationsAdditionAndRemoval() { + orderAuthorizationsAddition.clear(); + orderAuthorizationsRemoval.clear(); + } + } public interface IAllocationCriteria { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java index 22b2a5db2..f4f8acc49 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java @@ -366,6 +366,7 @@ public class SaveCommandBuilder { throw new RuntimeException(e); } } + state.cleanOrderAuthorizationsAdditionAndRemoval(); } private void createAdvancePercentagesIfRequired(Order order) {