diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index d2605c7af..d150eecb1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -49,6 +49,7 @@ import org.navalplanner.web.costcategories.ResourcesCostCategoryAssignmentContro
import org.navalplanner.web.resources.search.ResourcePredicate;
import org.navalplanner.web.resources.worker.CriterionsController;
import org.navalplanner.web.resources.worker.CriterionsMachineController;
+import org.navalplanner.web.resources.worker.WorkerCRUDController.LimitedResourceEnum;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.util.GenericForwardComposer;
@@ -58,11 +59,12 @@ import org.zkoss.zul.ComboitemRenderer;
import org.zkoss.zul.Constraint;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Grid;
+import org.zkoss.zul.Listbox;
+import org.zkoss.zul.Listitem;
import org.zkoss.zul.SimpleListModel;
import org.zkoss.zul.Tab;
import org.zkoss.zul.Textbox;
import org.zkoss.zul.api.Window;
-import org.navalplanner.web.resources.worker.WorkerCRUDController.LimitedResourceEnum;
/**
* Controller for {@link Machine} resource
@@ -99,7 +101,7 @@ public class MachineCRUDController extends GenericForwardComposer {
private Datebox filterFinishDate;
- private Combobox filterLimitedResource;
+ private Listbox filterLimitedResource;
private Textbox txtfilter;
@@ -143,7 +145,7 @@ public class MachineCRUDController extends GenericForwardComposer {
.getFellowIfAny("filterFinishDate");
this.filterStartDate = (Datebox) listWindow
.getFellowIfAny("filterStartDate");
- this.filterLimitedResource = (Combobox) listWindow
+ this.filterLimitedResource = (Listbox) listWindow
.getFellowIfAny("filterLimitedResource");
this.bdFilters = (BandboxMultipleSearch) listWindow
.getFellowIfAny("bdFilters");
@@ -518,7 +520,7 @@ public class MachineCRUDController extends GenericForwardComposer {
.getValue());
}
- final Comboitem item = filterLimitedResource.getSelectedItem();
+ final Listitem item = filterLimitedResource.getSelectedItem();
Boolean isLimitedResource = (item != null) ? LimitedResourceEnum
.valueOf((LimitedResourceEnum) item.getValue()) : null;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index e791ad74a..83bae25bc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -22,10 +22,8 @@ package org.navalplanner.web.resources.worker;
import static org.navalplanner.web.I18nHelper._;
-import java.util.Arrays;
import java.util.Date;
import java.util.EnumSet;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -58,6 +56,8 @@ import org.zkoss.zul.ComboitemRenderer;
import org.zkoss.zul.Constraint;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Grid;
+import org.zkoss.zul.Listbox;
+import org.zkoss.zul.Listitem;
import org.zkoss.zul.SimpleListModel;
import org.zkoss.zul.Tab;
import org.zkoss.zul.Textbox;
@@ -111,7 +111,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
private Datebox filterFinishDate;
- private Combobox filterLimitedResource;
+ private Listbox filterLimitedResource;
private BandboxMultipleSearch bdFilters;
@@ -297,7 +297,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
.getFellowIfAny("filterFinishDate");
this.filterStartDate = (Datebox) listWindow
.getFellowIfAny("filterStartDate");
- this.filterLimitedResource = (Combobox) listWindow
+ this.filterLimitedResource = (Listbox) listWindow
.getFellowIfAny("filterLimitedResource");
this.bdFilters = (BandboxMultipleSearch) listWindow
.getFellowIfAny("bdFilters");
@@ -607,7 +607,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
finishDate = LocalDate.fromDateFields(filterFinishDate.getValue());
}
- final Comboitem item = filterLimitedResource.getSelectedItem();
+ final Listitem item = filterLimitedResource.getSelectedItem();
Boolean isLimitedResource = (item != null) ? LimitedResourceEnum
.valueOf((LimitedResourceEnum) item.getValue()) : null;
diff --git a/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul b/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
index 9842b4263..b3963daa1 100644
--- a/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
@@ -12,7 +12,8 @@
-