diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java index a8e3235da..30c224db9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java @@ -46,7 +46,16 @@ public class ResourceAllocationController extends GenericForwardComposer { private Window window; public Set getCriterions() { - return resourceAllocationModel.getCriterions(); + Set criterions = resourceAllocationModel.getCriterions(); + if (criterions.isEmpty()) { + window.getFellow("requiredCriterions").setVisible(false); + window.getFellow("requiredCriterionsEmpty").setVisible(true); + } else { + window.getFellow("requiredCriterionsEmpty").setVisible(false); + window.getFellow("requiredCriterions").setVisible(true); + } + + return criterions; } public Set getResourceAllocations() { diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index 5c7c012c2..ee9b44f2b 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -51,6 +51,7 @@ +