diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java index 1c21bfb49..174eeb49e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java @@ -29,6 +29,7 @@ import org.navalplanner.web.common.OnlyOneVisible; import org.navalplanner.web.common.Util; import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry; import org.navalplanner.web.common.entrypoints.URLHandler; +import org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent; import org.navalplanner.web.tree.TreeComponent; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; @@ -77,14 +78,25 @@ public class OrderTemplatesController extends GenericForwardComposer implements @Override public void goToCreateTemplateFrom(OrderElement orderElement) { model.createTemplateFrom(orderElement); - show(getEditWindow()); + showEditWindow(); } public void goToEditForm(OrderElementTemplate template) { model.initEdit(template); + showEditWindow(); + } + + private void showEditWindow() { + bindMaterialsControllerWithCurrentTemplate(); show(getEditWindow()); } + private void bindMaterialsControllerWithCurrentTemplate() { + MaterialAssignmentTemplateComponent materialsComponent = (MaterialAssignmentTemplateComponent) getEditWindow() + .getFellow("listOrderElementMaterials"); + materialsComponent.getController().openWindow(model.getTemplate()); + } + private void show(Component window) { Util.reloadBindings(window); getVisibility().showOnly(window); diff --git a/navalplanner-webapp/src/main/webapp/templates/_edition.zul b/navalplanner-webapp/src/main/webapp/templates/_edition.zul index 4d535f7a7..98596e4e7 100644 --- a/navalplanner-webapp/src/main/webapp/templates/_edition.zul +++ b/navalplanner-webapp/src/main/webapp/templates/_edition.zul @@ -19,11 +19,14 @@ --> + + @@ -59,6 +62,9 @@ + + +