From f4e6f6f59bf3c3707c4d69e6265cc73fe5037435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Fri, 13 Jul 2012 11:43:31 +0200 Subject: [PATCH] Bug #1494: Deadline field disabled for subcontracted tasks also in Project Details perspective. FEA: ItEr76S04BugFixing --- .../web/orders/DetailsOrderElementController.java | 12 ++++++++++++ .../web/orders/OrderElementTreeController.java | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) 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 27005eaaf..8945e1ecc 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 @@ -25,6 +25,7 @@ import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.web.common.Util; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.api.Datebox; /** * Controller for {@link OrderElement} details @@ -37,6 +38,8 @@ public class DetailsOrderElementController extends private IOrderElementModel orderElementModel; + private Datebox deadline; + @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); @@ -53,6 +56,7 @@ public class DetailsOrderElementController extends public void openWindow(IOrderElementModel model) { setOrderElementModel(model); + deadline.setDisabled(isSubcontracted()); Util.reloadBindings(self); } @@ -67,6 +71,14 @@ public class DetailsOrderElementController extends return !orderElementModel.getOrderElement().isLeaf(); } + private boolean isSubcontracted() { + if (orderElementModel.getOrderElement() == null) { + return false; + } + return orderElementModel.getOrderElement().getTaskSource().getTask() + .isSubcontracted(); + } + public String getMoneyFormat() { return Util.getMoneyFormat(); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java index 46221c0b4..45af8c565 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java @@ -484,7 +484,8 @@ public class OrderElementTreeController extends TreeController { currentOrderElement.setDeadline(value); } }); - if (readOnly) { + if (readOnly || currentOrderElement.getTaskSource(). + getTask().isSubcontracted()) { dinamicDatebox.setDisabled(true); } addDateCell(dinamicDatebox, _("end"));