From 95477368967ced83f8164650e680cb36fc5ab91c Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Mon, 14 Jun 2010 13:11:31 +0200
Subject: [PATCH]  ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #477]
 Fixing Bug.

Disable movement on Gantt diagram of the tasks which have got consolidations.
---
 .../src/main/java/org/zkoss/ganttz/TaskComponent.java    | 5 +++--
 .../consolidations/AdvanceConsolidationController.java   | 9 +++++++++
 .../web/planner/taskedition/EditTaskController.java      | 5 -----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
index 156fbd271..55ccc71a6 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
@@ -331,7 +331,8 @@ public class TaskComponent extends Div implements AfterCompose {
     }
 
     public boolean isMovingTasksEnabled() {
-        return disabilityConfiguration.isMovingTasksEnabled()
+        return (disabilityConfiguration != null)
+                && disabilityConfiguration.isMovingTasksEnabled()
                 && task.canBeExplicitlyMoved();
     }
 
@@ -415,7 +416,7 @@ public class TaskComponent extends Div implements AfterCompose {
         updateProperties();
     }
 
-    private void updateProperties() {
+    public void updateProperties() {
         if (!isInPage()) {
             return;
         }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java
index 4677a2a25..d86beb5e5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java
@@ -31,6 +31,7 @@ import org.navalplanner.web.common.Util;
 import org.navalplanner.web.planner.order.PlanningState;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
+import org.zkoss.ganttz.TaskComponent;
 import org.zkoss.ganttz.extensions.IContextWithPlannerTask;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.SuspendNotAllowedException;
@@ -55,6 +56,8 @@ public class AdvanceConsolidationController extends GenericForwardComposer {
 
     private Window window;
 
+    private IContextWithPlannerTask<TaskElement> context;
+
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
@@ -64,6 +67,8 @@ public class AdvanceConsolidationController extends GenericForwardComposer {
     public void showWindow(IContextWithPlannerTask<TaskElement> context,
             org.navalplanner.business.planner.entities.Task task,
             PlanningState planningState) {
+
+        this.context = context;
         advanceConsolidationModel.initAdvancesFor(task, context, planningState);
 
         try {
@@ -83,6 +88,10 @@ public class AdvanceConsolidationController extends GenericForwardComposer {
 
     public void accept() {
         advanceConsolidationModel.accept();
+        if (context.getRelativeTo() instanceof TaskComponent) {
+            ((TaskComponent) context.getRelativeTo()).invalidate();
+            ((TaskComponent) context.getRelativeTo()).updateProperties();
+        }
         close();
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
index d1f01f2d9..968f7a9e8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
@@ -47,7 +47,6 @@ import org.navalplanner.web.planner.taskedition.TaskPropertiesController.Resourc
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
-import org.zkoss.ganttz.TaskComponent;
 import org.zkoss.ganttz.extensions.IContextWithPlannerTask;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
@@ -274,10 +273,6 @@ public class EditTaskController extends GenericForwardComposer {
         if (context != null) {
             context.getTask().reloadResourcesText();
             context.reloadCharts();
-
-            if (context.getRelativeTo() instanceof TaskComponent) {
-                ((TaskComponent) context.getRelativeTo()).invalidate();
-            }
         }
     }