From e5cd66ed627d6537a35ecddec054ef7be0f0f9d5 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Thu, 1 Oct 2009 18:12:37 +0200
Subject: [PATCH]  ItEr28S11AltaEtiquetasTipoEtiquetaItEr27S11: Moved Label
 constraint checking to createAndAssign method

---
 .../orders/AssignedLabelsToOrderElementController.java    | 8 +++++++-
 .../src/main/webapp/orders/_listOrderElementLabels.zul    | 2 +-
 2 files changed, 8 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 c73dc52c3..9e7ed06cd 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
@@ -55,10 +55,15 @@ public class AssignedLabelsToOrderElementController extends
             throw new WrongValueException(cbLabelType, _("cannot be null"));
         }
 
+        // Check Label is not null or empty
         final String labelName = txtLabelName.getValue();
-        final LabelType labelType = (LabelType) comboitem.getValue();
+        if (labelName == null || labelName.isEmpty()) {
+            throw new WrongValueException(txtLabelName,
+                    _("cannot be null or empty"));
+        }
 
         // Label does not exist, create
+        final LabelType labelType = (LabelType) comboitem.getValue();
         Label label = assignedLabelsToOrderElementModel
                 .findLabelByNameAndType(labelName, labelType);
         if (label == null) {
@@ -82,6 +87,7 @@ public class AssignedLabelsToOrderElementController extends
     private void assignLabel(Label label) {
         assignedLabelsToOrderElementModel.assignLabel(label);
         Util.reloadBindings(directLabels);
+        txtLabelName.setValue("");
     }
 
     private Label createLabel(String labelName, LabelType labelType) {
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
index 733b7bca7..79390d067 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
@@ -50,7 +50,7 @@
     </vbox>
     <hbox>
         <autocomplete id="cbLabelType" finder="LabelTypeFinder" buttonVisible="true" />
-        <textbox id="txtLabelName" constraint="no empty:${i18n:_('cannot be null or empty')}" />
+        <textbox id="txtLabelName" />
         <button style="margin-top: -4px" label="${i18n:_('Create &amp; Assign')}"
             onClick="assignedLabelsController.createAndAssign()"/>
     </hbox>