From 8fb3f25dd72e35809dc70994977276f01eb6e75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Fri, 12 Feb 2010 13:35:19 +0100 Subject: [PATCH] ItEr47S14RFControlesRelacionadosPermismosItEr46S15: When the status is STORED, changes to a different one and then changes back to STORED, the save buttons are disabled again. --- .../navalplanner/web/orders/OrderCRUDController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index ad04a4bd8..6fa5b9413 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -423,6 +423,7 @@ public class OrderCRUDController extends GenericForwardComposer { setEditionDisabled(true); } orderAuthorizationController.initEdit((Order) orderModel.getOrder()); + initialStatus = order.getState(); initializeTabs(); showWindow(editWindow); } @@ -604,6 +605,7 @@ public class OrderCRUDController extends GenericForwardComposer { setEditionDisabled(true); } orderAuthorizationController.initEdit(order); + initialStatus = order.getState(); showEditWindow(_("Edit order")); } else { @@ -1014,6 +1016,8 @@ public class OrderCRUDController extends GenericForwardComposer { ((Button)editWindow.getFellowIfAny("save_and_continue")).setDisabled(disabled); } + private OrderStatusEnum initialStatus; + public void onStatusChange() { Order order = (Order)orderModel.getOrder(); if(orderModel.userCanWrite(order, SecurityUtils.getSessionUserLoginName()) @@ -1022,5 +1026,11 @@ public class OrderCRUDController extends GenericForwardComposer { //any other one setEditionDisabled(false); } + if(initialStatus == OrderStatusEnum.STORED && + order.getState() == OrderStatusEnum.STORED) { + //Status was STORED, it was changed to a different one and then + //changed back to STORED, so we have to disable the save buttons + setEditionDisabled(true); + } } }