From 47b88ae9c9ca315c8cd4d2275feb54172ff66128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sun, 10 Jan 2010 17:45:21 +0100 Subject: [PATCH] ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: Disabling the templates tree when the template is a line. When a child wants to be added, the OrderLineTemplate itself cannot be turned into a container if it's the root. --- .../org/navalplanner/web/templates/IOrderTemplatesModel.java | 2 ++ .../navalplanner/web/templates/OrderTemplatesController.java | 4 ++++ .../org/navalplanner/web/templates/OrderTemplatesModel.java | 5 +++++ navalplanner-webapp/src/main/webapp/templates/_edition.zul | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java index a9790c37c..f4f3a601b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java @@ -42,4 +42,6 @@ public interface IOrderTemplatesModel { void initEdit(OrderElementTemplate template); EntitiesTree getTemplatesTreeModel(); + + boolean isTemplateTreeDisabled(); } 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 174eeb49e..011ba3a25 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 @@ -97,6 +97,10 @@ public class OrderTemplatesController extends GenericForwardComposer implements materialsComponent.getController().openWindow(model.getTemplate()); } + public boolean isTemplateTreeDisabled() { + return model.isTemplateTreeDisabled(); + } + private void show(Component window) { Util.reloadBindings(window); getVisibility().showOnly(window); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java index 5f235f873..00be35b15 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java @@ -107,4 +107,9 @@ public class OrderTemplatesModel implements IOrderTemplatesModel { return treeModel; } + @Override + public boolean isTemplateTreeDisabled() { + return template != null && template.isLeaf(); + } + } diff --git a/navalplanner-webapp/src/main/webapp/templates/_edition.zul b/navalplanner-webapp/src/main/webapp/templates/_edition.zul index 98596e4e7..018380b32 100644 --- a/navalplanner-webapp/src/main/webapp/templates/_edition.zul +++ b/navalplanner-webapp/src/main/webapp/templates/_edition.zul @@ -25,7 +25,7 @@ - +