From f0596bbad2fce21aa6c8b96977e6b83ecf7ef32a Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Fri, 14 May 2010 11:33:23 +0200
Subject: [PATCH]  ItEr58S04ValidacionEProbasFuncionaisItEr57S04: [Bug #443]
 Fixing Bug.

Shows the order element name in its edit window.
---
 .../web/orders/OrderElementController.java          | 13 +++++++++++++
 .../src/main/webapp/orders/_editOrderElement.zul    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
index 8ddf58df2..263e2fc7a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
@@ -20,6 +20,9 @@
 
 package org.navalplanner.web.orders;
 
+import static org.navalplanner.web.I18nHelper._;
+
+import org.apache.commons.lang.StringUtils;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.orders.entities.OrderLine;
@@ -109,6 +112,15 @@ public class OrderElementController extends GenericForwardComposer {
         }
     }
 
+    public String getOrderElementName() {
+        String name = "";
+        if ((getOrderElement() != null)
+                && (!StringUtils.isBlank(getOrderElement().getName()))) {
+            name = ": " + getOrderElement().getName();
+        }
+        return _("Edit order element {0}", name);
+    }
+
     public void setupManageOrderElementAdvancesController()
             throws Exception {
         if (manageOrderElementAdvancesController == null) {
@@ -188,6 +200,7 @@ public class OrderElementController extends GenericForwardComposer {
         assignedTaskQualityFormsController = null;
 
         try {
+            ((Window) self).setTitle(getOrderElementName());
             ((Window) self).doModal();
         } catch (SuspendNotAllowedException e) {
             throw new RuntimeException(e);
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index 9f4047f0d..b1ab406e3 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -30,7 +30,7 @@
     macroURI="/orders/components/_listOrderElementMaterials.zul"?>
 <?component name="listOrderElementTaskQualityForms" inline="true" macroURI="_listOrderElementTaskQualityForms.zul"?>
 
-<window id="${arg.top_id}" title="${i18n:_('Edit order element')}"
+<window id="${arg.top_id}" title="@{i18n:_('Edit order element')}"
     width="950px" left="50px" top="50px"
     closable="true" visible="false">