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 011ba3a25..08f741fc1 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.labels.LabelsAssignmentToTemplateComponent; import org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent; import org.navalplanner.web.tree.TreeComponent; import org.springframework.beans.factory.annotation.Autowired; @@ -88,6 +89,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements private void showEditWindow() { bindMaterialsControllerWithCurrentTemplate(); + bindLabelsControllerWithCurrentTemplate(); show(getEditWindow()); } @@ -97,6 +99,12 @@ public class OrderTemplatesController extends GenericForwardComposer implements materialsComponent.getController().openWindow(model.getTemplate()); } + private void bindLabelsControllerWithCurrentTemplate() { + LabelsAssignmentToTemplateComponent labelsComponent = (LabelsAssignmentToTemplateComponent) getEditWindow() + .getFellow("listOrderElementLabels"); + labelsComponent.getController().openWindow(model); + } + public boolean isTemplateTreeDisabled() { return model.isTemplateTreeDisabled(); } diff --git a/navalplanner-webapp/src/main/webapp/templates/_edition.zul b/navalplanner-webapp/src/main/webapp/templates/_edition.zul index 018380b32..d030c900d 100644 --- a/navalplanner-webapp/src/main/webapp/templates/_edition.zul +++ b/navalplanner-webapp/src/main/webapp/templates/_edition.zul @@ -21,11 +21,13 @@ class="org.navalplanner.web.templates.TemplatesTreeComponent"?> + + @@ -62,6 +64,9 @@ + + +