From 43e14d8daed3c12e32c3644a4c458134a37c9b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Fri, 14 Jun 2013 21:04:09 +0200 Subject: [PATCH] Added condition to show resources budget column FEA: ItEr77S17AutomaticBudgeting --- .../java/org/libreplan/web/orders/OrdersTreeComponent.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java index 867960469..3fa1ea190 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrdersTreeComponent.java @@ -25,6 +25,7 @@ import static org.libreplan.web.I18nHelper._; import java.util.ArrayList; import java.util.List; +import org.libreplan.business.common.Registry; import org.libreplan.business.common.daos.IConfigurationDAO; import org.libreplan.business.common.entities.Configuration; import org.libreplan.business.orders.entities.OrderElement; @@ -94,7 +95,9 @@ public class OrdersTreeComponent extends TreeComponent { }); - // Pending to add condition with configuration.isEnabledAutomaticBudget + if (Registry.getConfigurationDAO() + .getConfigurationWithReadOnlyTransaction() + .isEnabledAutomaticBudget()) { columns.add(new OrdersTreeColumn(_("Resources"), "autobudget", _("resources")) { @@ -106,6 +109,8 @@ public class OrdersTreeComponent extends TreeComponent { }); + } + columns.add(new OrdersTreeColumn(_("Must start after"), "estimated_init", _("Estimated start date for the task (press enter in textbox to open calendar popup or type in date directly)")) {