From a0ca0d4d3677cbf69163f9d55380fec80bd3c37a Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 4 Mar 2010 18:57:37 +0100 Subject: [PATCH] ItEr49S04ValidacionEProbasFuncionaisItEr48S04: [Bug #368] Not allowing remove orders with some order element that is already referenced in a work report. --- .../web/orders/OrderCRUDController.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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 35741e481..a11d871b1 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 @@ -611,9 +611,20 @@ public class OrderCRUDController extends GenericForwardComposer { } private void remove(Order order) { - orderModel.remove(order); - Util.reloadBindings(self); - messagesForUser.showMessage(Level.INFO, _("Removed {0}", order.getName())); + boolean alreadyInUse = orderModel.isAlreadyInUse(order); + if (alreadyInUse) { + messagesForUser + .showMessage( + Level.ERROR, + _( + "You can not remove the order element \"{0}\" because of any of its order elements are already in use in some work reports", + order.getName())); + } else { + orderModel.remove(order); + Util.reloadBindings(self); + messagesForUser.showMessage(Level.INFO, _("Removed {0}", order + .getName())); + } } public void schedule(Order order) {