From d5167874ac1844556279f231e40e084f33cbd771 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Thu, 1 Oct 2009 18:12:33 +0200
Subject: [PATCH]  ItEr28S11AltaEtiquetasTipoEtiquetaItEr27S11: Remove label
 assigned to OrderElement

---
 .../web/orders/AssignedLabelsToOrderElementController.java  | 5 +++++
 .../web/orders/AssignedLabelsToOrderElementModel.java       | 5 +++++
 .../web/orders/IAssignedLabelsToOrderElementModel.java      | 6 ++++++
 .../src/main/webapp/orders/_listOrderElementLabels.zul      | 5 +++--
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
index eecdd4472..7c5768ee5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
@@ -72,4 +72,9 @@ public class AssignedLabelsToOrderElementController extends
         return assignedLabelsToOrderElementModel.getLabels();
     }
 
+    public void deleteLabel(Label label) {
+        assignedLabelsToOrderElementModel.deleteLabel(label);
+        Util.reloadBindings(directLabels);
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
index 14edb33c4..1c8845ebb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
@@ -67,4 +67,9 @@ public class AssignedLabelsToOrderElementModel implements
         label.setType(labelType);
         orderElement.addLabel(label);
     }
+
+    @Override
+    public void deleteLabel(Label label) {
+        orderElement.removeLabel(label);
+    }
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java
index 8ad3419b9..b733789cb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java
@@ -46,4 +46,10 @@ public interface IAssignedLabelsToOrderElementModel {
      */
     public List<Label> getLabels();
 
+    /**
+     *
+     * @param label
+     */
+    void deleteLabel(Label label);
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
index 2c515e209..5ad92bbf4 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
@@ -25,10 +25,11 @@
                 <column label="${i18n:_('Operations')}" />
             </columns>
             <rows>
-                <row self="@{each='label'}">
+                <row self="@{each='label'}" value="@{label}">
                     <label value="@{label.type.name}"/>
                     <label value="@{label.name}"/>
-                    <button label="${i18n:_('Delete')}" />
+                    <button label="${i18n:_('Delete')}"
+                        onClick="assignedLabelsController.deleteLabel(self.parent.value)"/>
                 </row>
             </rows>
         </grid>