From 7d9f997f3c10ef64818df6f07e86bd88655ca26e Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 19 Apr 2012 15:54:47 +0200 Subject: [PATCH] Bug #1416: Reload resources text in parent tasks too Removed call to reload resources text from progress consolidation window and advanced allocation window as it was not needed. FEA: ItEr76S04BugFixing --- ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java | 11 +++++++++++ .../consolidations/AdvanceConsolidationModel.java | 4 +--- .../taskedition/AdvancedAllocationTaskController.java | 3 +-- .../web/planner/taskedition/EditTaskController.java | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java index 57e7b17a1..3e77f624c 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -41,6 +41,7 @@ import org.zkoss.ganttz.data.GanttDiagramGraph.IDependenciesEnforcerHookFactory; import org.zkoss.ganttz.data.GanttDiagramGraph.INotificationAfterDependenciesEnforcement; import org.zkoss.ganttz.data.constraint.Constraint; import org.zkoss.ganttz.data.constraint.Constraint.IConstraintViolationListener; +import org.zkoss.ganttz.extensions.IContextWithPlannerTask; import org.zkoss.ganttz.util.ConstraintViolationNotificator; import org.zkoss.ganttz.util.WeakReferencedListeners.Mode; @@ -471,6 +472,16 @@ public abstract class Task implements ITaskFundamentalProperties { } } + public static void reloadResourcesText(IContextWithPlannerTask context) { + Task task = context.getTask(); + task.reloadResourcesText(); + List parents = context.getMapper().getParents( + task); + for (TaskContainer each : parents) { + each.reloadResourcesText(); + } + } + public boolean isSubcontracted() { return fundamentalProperties.isSubcontracted(); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java index f08e345ee..bf45220f3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java @@ -3,7 +3,7 @@ * * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * Copyright (C) 2010-2012 Igalia, S.L. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -57,7 +57,6 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.zkoss.ganttz.data.GanttDate; import org.zkoss.ganttz.extensions.IContextWithPlannerTask; /** @@ -152,7 +151,6 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel { updateConsolidationInAdvanceIfIsNeeded(); ganttTask.enforceDependenciesDueToPositionPotentiallyModified(); - ganttTask.reloadResourcesText(); context.reloadCharts(); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java index d58b10d7f..e5ead90be 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/AdvancedAllocationTaskController.java @@ -1,7 +1,7 @@ /* * This file is part of LibrePlan * - * Copyright (C) 2011 Igalia, S.L. + * Copyright (C) 2011-2012 Igalia, S.L. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -158,7 +158,6 @@ public class AdvancedAllocationTaskController extends GenericForwardComposer { private void askForReloads() { if (context != null) { - context.getTask().reloadResourcesText(); context.reloadCharts(); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java index 5c74ee101..4cd0a5fb9 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java @@ -3,7 +3,7 @@ * * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e * Desenvolvemento Tecnolóxico de Galicia - * Copyright (C) 2010-2011 Igalia, S.L. + * Copyright (C) 2010-2012 Igalia, S.L. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -310,7 +310,7 @@ public class EditTaskController extends GenericForwardComposer { private void askForReloads() { if (context != null) { - context.getTask().reloadResourcesText(); + org.zkoss.ganttz.data.Task.reloadResourcesText(context); context.reloadCharts(); if (context.getRelativeTo() instanceof TaskComponent) { ((TaskComponent) context.getRelativeTo()).updateProperties();