diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java index 3358fe0f4..5fb9de16f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java @@ -23,6 +23,7 @@ import org.navalplanner.business.templates.entities.OrderElementTemplate; import org.navalplanner.web.common.Util; import org.navalplanner.web.templates.advances.AdvancesAssignmentComponent; import org.navalplanner.web.templates.labels.LabelsAssignmentToTemplateComponent; +import org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Window; @@ -80,6 +81,7 @@ public class EditTemplateWindowController extends GenericForwardComposer { } bindAdvancesAssignment(template); bindOrderElementLabels(template); + bindOrderElementMaterials(template); Util.reloadBindings(editTemplateWindow); } @@ -96,6 +98,12 @@ public class EditTemplateWindowController extends GenericForwardComposer { component.getController().openWindow(model); } + private void bindOrderElementMaterials(OrderElementTemplate template) { + MaterialAssignmentTemplateComponent component = (MaterialAssignmentTemplateComponent) editTemplateWindow + .getFellow("listOrderElementMaterials"); + component.getController().openWindow(template); + } + public void onClick$backButton() { editTemplateWindow.setVisible(false); } diff --git a/navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul b/navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul index 5f40b4970..3a1c0c42f 100644 --- a/navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul +++ b/navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul @@ -19,6 +19,8 @@ --> + @@ -26,6 +28,7 @@ + @@ -34,6 +37,9 @@ + + +