From e02c466593f7b247b9bc42b1667f0f1ef3b81f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 2 Aug 2010 16:49:14 +0200 Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #556] Fix bug. Updating disability rules when entering creation form. When using zk 3.6.2 they were being updated due to onStatusChange being called when entering the page. Now with 3.6.4 that is not happening anymore. --- .../org/navalplanner/web/orders/OrderCRUDController.java | 5 +++++ 1 file changed, 5 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 2b7d6ba60..356441161 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 @@ -847,6 +847,7 @@ public class OrderCRUDController extends GenericForwardComposer { showOrderElementFilter(); showCreateButtons(false); orderModel.prepareForCreate(); + updateDisabilitiesOnInterface(); showEditWindow(_("Create order")); checkCreationPermissions(); } catch (ConcurrentModificationException e) { @@ -1218,6 +1219,10 @@ public class OrderCRUDController extends GenericForwardComposer { private OrderStatusEnum initialStatus; public void onStatusChange() { + updateDisabilitiesOnInterface(); + } + + private void updateDisabilitiesOnInterface() { Order order = (Order)orderModel.getOrder(); if(orderModel.userCanWrite(order, SecurityUtils.getSessionUserLoginName()) && order.getState() != OrderStatusEnum.STORED) {