From e1ac8d2909866fac355070059565d4bc21d9c476 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Thu, 1 Oct 2009 18:12:32 +0200
Subject: [PATCH]  ItEr28S11AltaEtiquetasTipoEtiquetaItEr27S11: Add constraints
 on creating label

---
 .../orders/AssignedLabelsToOrderElementController.java    | 8 +-------
 .../src/main/webapp/orders/_listOrderElementLabels.zul    | 2 +-
 2 files changed, 2 insertions(+), 8 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 4d61bedd3..eecdd4472 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
@@ -48,20 +48,14 @@ public class AssignedLabelsToOrderElementController extends
     }
 
     public void createAndAssign() {
+
         // Check LabelType is not null
         final Comboitem comboitem = cbLabelType.getSelectedItem();
         if (comboitem == null || comboitem.getValue() == null) {
             throw new WrongValueException(cbLabelType, _("cannot be null"));
         }
 
-        // Check Label is not null or empty
         final String labelName = txtLabelName.getValue();
-        if (labelName == null || labelName.isEmpty()) {
-            throw new WrongValueException(txtLabelName,
-                    _("cannot be null or empty"));
-        }
-
-
         final LabelType labelType = (LabelType) comboitem.getValue();
         if (!assignedLabelsToOrderElementModel.existsLabelByNameAndType(
                 labelName, labelType)) {
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
index 5c4466458..2c515e209 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul
@@ -49,7 +49,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" constraint="no empty:${i18n:_('cannot be null or empty')}" />
         <button style="margin-top: -4px" label="${i18n:_('Create &amp; Assign')}"
             onClick="assignedLabelsController.createAndAssign()"/>
     </hbox>