From 7bfdf5f04d29d5ab287371f1d4e902b3a35888fd Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 14 Mar 2012 16:00:10 +0100 Subject: [PATCH] Add budget field in order element details form FEA: ItEr76S17MoneyCostMonitoringSystem --- .../web/orders/DetailsOrderElementController.java | 7 +++++++ .../src/main/webapp/orders/_orderElementDetails.zul | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java index 57c4d142d..6694ce283 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DetailsOrderElementController.java @@ -60,4 +60,11 @@ public class DetailsOrderElementController extends return orderElementModel.isCodeAutogenerated(); } + public boolean isContainer() { + if (orderElementModel.getOrderElement() == null) { + return false; + } + return !orderElementModel.getOrderElement().isLeaf(); + } + } \ No newline at end of file diff --git a/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul b/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul index bb201e16c..483c34964 100644 --- a/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul +++ b/libreplan-webapp/src/main/webapp/orders/_orderElementDetails.zul @@ -61,6 +61,12 @@ value="@{detailsController.orderElement.description}" width="600px" /> + +