From 430ce0535d79e13b8e7125541f96eb5728137ec4 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 29 Dec 2009 14:08:35 +0100
Subject: [PATCH]  ItEr41S16ImplantacionAplicacionItEr40S21: [Bug #53] Fixed
 problem with calendars creating new resources.

---
 .../machine/MachineCRUDController.java        |  9 ++++--
 .../worker/WorkerCRUDController.java          | 31 +++++++++----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index edfd14ecd..ec4e591f1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -148,6 +148,7 @@ public class MachineCRUDController extends GenericForwardComposer {
         resourcesCostCategoryAssignmentController.setResource(machineModel.getMachine());
         selectMachineDataTab();
         showEditWindow(_("Create machine"));
+        resourceCalendarModel.cancel();
     }
 
     private void showEditWindow(String title) {
@@ -349,9 +350,11 @@ public class MachineCRUDController extends GenericForwardComposer {
 
             @Override
             public void save() {
-                machineModel
-                        .setCalendarOfMachine((ResourceCalendar) resourceCalendarModel
-                                .getBaseCalendar());
+                ResourceCalendar calendar = (ResourceCalendar) resourceCalendarModel
+                        .getBaseCalendar();
+                if (calendar != null) {
+                    machineModel.setCalendarOfMachine(calendar);
+                }
                 reloadWindow();
             }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index 462a48d47..cd95806bc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -223,16 +223,15 @@ public class WorkerCRUDController extends GenericForwardComposer implements
     }
 
     public void goToCreateForm() {
-            getBookmarker().goToCreateForm();
-            workerModel.prepareForCreate();
-        if (workerModel.getCalendar() == null) {
-            createCalendar();
-        }
-            createAsignedCriterions();
-            resourcesCostCategoryAssignmentController.setResource(workerModel.getWorker());
-            editWindow.setTitle(_("Create Worker"));
-            getVisibility().showOnly(editWindow);
-            Util.reloadBindings(editWindow);
+        getBookmarker().goToCreateForm();
+        workerModel.prepareForCreate();
+        createAsignedCriterions();
+        resourcesCostCategoryAssignmentController.setResource(workerModel
+                .getWorker());
+        editWindow.setTitle(_("Create Worker"));
+        getVisibility().showOnly(editWindow);
+        Util.reloadBindings(editWindow);
+        resourceCalendarModel.cancel();
     }
 
     @Override
@@ -403,9 +402,11 @@ public class WorkerCRUDController extends GenericForwardComposer implements
             @Override
             public void save() {
                 Integer capacity = workerModel.getCapacity();
-                workerModel
-                        .setCalendar((ResourceCalendar) resourceCalendarModel
-                                .getBaseCalendar());
+                ResourceCalendar calendar = (ResourceCalendar) resourceCalendarModel
+                        .getBaseCalendar();
+                if (calendar != null) {
+                    workerModel.setCalendar(calendar);
+                }
                 reloadCurrentWindow();
                 workerModel.setCapacity(capacity);
             }
@@ -442,15 +443,13 @@ public class WorkerCRUDController extends GenericForwardComposer implements
 
     public void goToCreateVirtualWorkerForm() {
         workerModel.prepareForCreate(true);
-        if (workerModel.getCalendar() == null) {
-            createCalendar();
-        }
         createAsignedCriterions();
         resourcesCostCategoryAssignmentController.setResource(workerModel
                 .getWorker());
         editWindow.setTitle(_("Create virtual resource"));
         getVisibility().showOnly(editWindow);
         Util.reloadBindings(editWindow);
+        resourceCalendarModel.cancel();
     }
 
     public boolean isVirtualWorker() {