From feaa55e6f6b6b38921f20a531071fea8805834bb Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 22 Sep 2010 13:38:52 +0200
Subject: [PATCH] [Bug #599] Fix bug adding a new method when it comes from
 limiting resources view.

---
 .../LimitingResourcesController.java          |  2 +-
 .../taskedition/EditTaskController.java       | 27 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
index e411fe675..62bc0eaed 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
@@ -327,7 +327,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
             Task task = oldElement.getTask();
 
             EditTaskController editTaskController = getEditController(editTaskWindow);
-            editTaskController.showEditFormResourceAllocation(task);
+            editTaskController.showEditFormResourceAllocationFromLimitingResources(task);
 
             Set<LimitingResourceQueueDependency> outgoingDependencies = oldElement.getDependenciesAsOrigin();
             Set<LimitingResourceQueueDependency> incomingDependencies = oldElement.getDependenciesAsDestiny();
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 815e7be41..d059b6dfa 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
@@ -145,6 +145,12 @@ public class EditTaskController extends GenericForwardComposer {
 
     private void showEditForm(IContextWithPlannerTask<TaskElement> context,
             TaskElement taskElement, PlanningState planningState) {
+        showEditForm(context, taskElement, planningState, false);
+    }
+
+    private void showEditForm(IContextWithPlannerTask<TaskElement> context,
+            TaskElement taskElement, PlanningState planningState,
+            boolean fromLimitingResourcesView) {
         this.taskElement = taskElement;
         this.context = context;
         this.planningState = planningState;
@@ -153,9 +159,13 @@ public class EditTaskController extends GenericForwardComposer {
 
         try {
             window.setTitle(_("Edit task: {0}", taskElement.getName()));
-            window.setMode("modal");
             showSelectedTabPanel();
             Util.reloadBindings(window);
+            if (fromLimitingResourcesView) {
+                window.doModal();
+            } else {
+                window.setMode("modal");
+            }
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -210,15 +220,23 @@ public class EditTaskController extends GenericForwardComposer {
         showEditForm(context, taskElement, planningState);
     }
 
-    public void showEditFormResourceAllocation(TaskElement taskElement) {
+    public void showEditFormResourceAllocationFromLimitingResources(TaskElement taskElement) {
         limitingResourceAllocationController.setDisableHours(false);
         taskPropertiesTab.setVisible(false);
-        showEditFormResourceAllocation(null, taskElement, null);
+        showEditFormResourceAllocation(null, taskElement, null, true);
     }
 
     public void showEditFormResourceAllocation(
             IContextWithPlannerTask<TaskElement> context,
             TaskElement taskElement, PlanningState planningState) {
+        showEditFormResourceAllocation(context, taskElement, planningState,
+                false);
+    }
+
+    public void showEditFormResourceAllocation(
+            IContextWithPlannerTask<TaskElement> context,
+            TaskElement taskElement, PlanningState planningState,
+            boolean fromLimitingResourcesView) {
 
         if (isTask(taskElement)) {
             Task task = asTask(taskElement);
@@ -230,7 +248,8 @@ public class EditTaskController extends GenericForwardComposer {
         } else {
             editTaskTabbox.setSelectedPanelApi(taskPropertiesTabpanel);
         }
-        showEditForm(context, taskElement, planningState);
+        showEditForm(context, taskElement, planningState,
+                fromLimitingResourcesView);
     }
 
     public void selectAssignmentTab(int index) {