From 85dc8d240eec9c68135de1658ee5bff0059f6398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Mon, 4 Jan 2010 17:25:15 +0100
Subject: [PATCH]  ItEr42S14CUAsignarUsuarioAProxectoTraballoItEr41S17:
 Implemented deletion of order authorizations from the web interface

---
 .../web/users/OrderAuthorizationModel.java          | 13 +++++++++++++
 .../orders/_listOrderElementAuthorizations.zul      |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java
index e2bd3ee4a..c5ed43c47 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java
@@ -38,6 +38,8 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel {
 
     private List<UserOrderAuthorization> userOrderAuthorizationList;
 
+    private List<OrderAuthorization> orderAuthorizationRemovalList;
+
     @Autowired
     private IOrderAuthorizationDAO dao;
 
@@ -106,6 +108,12 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel {
         for(OrderAuthorization authorization : userOrderAuthorizationList) {
             dao.save(authorization);
         }
+        for(OrderAuthorization authorization : orderAuthorizationRemovalList) {
+            try {
+                dao.remove(authorization.getId());
+            }
+            catch(InstanceNotFoundException e) {}
+        }
     }
 
     @Override
@@ -126,6 +134,8 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel {
             new ArrayList<ProfileOrderAuthorization>();
         userOrderAuthorizationList =
             new ArrayList<UserOrderAuthorization>();
+        orderAuthorizationRemovalList =
+            new ArrayList<OrderAuthorization>();
 
         if(!order.isNewObject()) {
             //Retrieve the OrderAuthorizations associated with this order
@@ -163,6 +173,9 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel {
             profileOrderAuthorizationList.remove(
                     (ProfileOrderAuthorization) orderAuthorization);
         }
+        if(!orderAuthorization.isNewObject()) {
+            orderAuthorizationRemovalList.add(orderAuthorization);
+        }
     }
 
     private ProfileOrderAuthorization createProfileOrderAuthorization(
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul
index ec77c2226..486ba97c1 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul
@@ -48,7 +48,8 @@
                         <hbox>
                             <button sclass="icono" image="/common/img/ico_borrar1.png"
                                 hoverImage="/common/img/ico_borrar.png"
-                                onClick="controller.removeOrderAuthorization(self.parent.parent.value);"
+                                onClick="orderAuthorizationController.
+                                    removeOrderAuthorization(self.parent.parent.value);"
                                 tooltiptext="${i18n:_('Delete')}" />
                         </hbox>
                     </row>
@@ -83,6 +84,8 @@
                         <label value="@{authorization.authorizationType.displayName}" />
                         <hbox>
                             <button sclass="icono" image="/common/img/ico_borrar1.png"
+                                onClick="orderAuthorizationController.
+                                    removeOrderAuthorization(self.parent.parent.value);"
                                 hoverImage="/common/img/ico_borrar.png"
                                 tooltiptext="${i18n:_('Delete')}" />
                         </hbox>