From 98c3dc4d106ad8153302f4ae68674b2d21caaa0a Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 7 Apr 2010 12:03:26 +0200 Subject: [PATCH] ItEr53S12CUCreacionRecursosLimitantesItEr52S13: Value of field isLimitedResource cannot be modified on already created resources --- .../web/resources/machine/MachineCRUDController.java | 4 ++++ .../web/resources/worker/WorkerCRUDController.java | 4 ++++ .../src/main/webapp/resources/machine/_editMachine.zul | 3 ++- .../src/main/webapp/resources/worker/_edition.zul | 5 +++-- 4 files changed, 13 insertions(+), 3 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 f47216587..d2605c7af 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 @@ -572,4 +572,8 @@ public class MachineCRUDController extends GenericForwardComposer { } } + public boolean isEditing() { + return (getMachine() != null && !getMachine().isNewObject()); + } + } 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 e8e664711..9cf1a2b25 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 @@ -704,4 +704,8 @@ public class WorkerCRUDController extends GenericForwardComposer implements } } + public boolean isEditing() { + return (getWorker() != null && !getWorker().isNewObject()); + } + } diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul index 5534c2bd5..4aaf043a5 100644 --- a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul +++ b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul @@ -59,7 +59,8 @@ + onSelect="controller.setLimitedResource(self.selectedItem.value);" + disabled="@{controller.isEditing}" /> diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul index c1e118704..c46554606 100644 --- a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul +++ b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul @@ -65,11 +65,12 @@ -