From ee0c6ec9eed2936c6cc6a7f00f45a83346a30913 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 2 Sep 2011 11:47:30 +0200 Subject: [PATCH] [Bug #1125] Disable remove button if unit type is assigned to any material FEA: ItEr75S04BugFixing --- .../navalplanner/web/materials/UnitTypeController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java index 77271578c..9f52f173b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java @@ -39,6 +39,7 @@ import org.zkoss.zk.ui.event.CheckEvent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zul.Button; import org.zkoss.zul.Constraint; import org.zkoss.zul.Hbox; import org.zkoss.zul.Label; @@ -96,13 +97,17 @@ public class UnitTypeController extends BaseCRUDController { } })); - hbox.appendChild(Util.createRemoveButton(new EventListener() { + Button removeButton = Util + .createRemoveButton(new EventListener() { @Override public void onEvent(Event event) { confirmDelete(unitType); } - })); + }); + removeButton.setDisabled(unitTypeModel + .isUnitTypeUsedInAnyMaterial(unitType)); + hbox.appendChild(removeButton); row.appendChild(hbox); }