RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr58S04ValidacionEProbasFuncionaisItEr57S04: [Bug #443] Fixing Bug.

Browse source 
Shows the order element name in its edit window.
This commit is contained in:
Susana Montes Pedreira 2010-05-14 11:33:23 +02:00 • committed by Javier Moran Rua
parent bc48d2c763
commit f0596bbad2
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -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);

2
navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
View file

@ -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">