From 84726c544f0a1b90f44fc16e4aa4283108c1e89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Mon, 15 Nov 2010 19:06:20 +0100
Subject: [PATCH] [Bug #707] Fixed bug, setting up the listbox programatically
 from the java controller.

FEA: ItEr63S03BugFixing
---
 .../resources/machine/MachineCRUDController.java   | 14 ++++++++++++--
 .../web/resources/worker/WorkerCRUDController.java | 14 ++++++++++++--
 .../webapp/resources/search/_resourceFilter.zul    |  4 +---
 3 files changed, 25 insertions(+), 7 deletions(-)

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 e457f4f08..99dc36493 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
@@ -62,6 +62,7 @@ import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Grid;
 import org.zkoss.zul.Listbox;
+import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.SimpleListModel;
@@ -135,6 +136,7 @@ public class MachineCRUDController extends GenericForwardComposer {
         setupResourcesCostCategoryAssignmentController(comp);
         showListWindow();
         initFilterComponent();
+        setupFilterLimitingResourceListbox();
     }
 
     private void showListWindow() {
@@ -554,8 +556,16 @@ public class MachineCRUDController extends GenericForwardComposer {
         listing.invalidate();
     }
 
-    public Set<LimitingResourceEnum> getLimitingResourceFilterOptionList() {
-        return LimitingResourceEnum.getLimitingResourceFilterOptionList();
+    private void setupFilterLimitingResourceListbox() {
+        for(LimitingResourceEnum resourceEnum :
+            LimitingResourceEnum.getLimitingResourceFilterOptionList()) {
+            Listitem item = new Listitem();
+            item.setParent(filterLimitingResource);
+            item.setValue(resourceEnum);
+            item.appendChild(new Listcell(resourceEnum.toString()));
+            filterLimitingResource.appendChild(item);
+        }
+        filterLimitingResource.setSelectedIndex(0);
     }
 
     public Set<LimitingResourceEnum> getLimitingResourceOptionList() {
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 a99b19c61..c249def03 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
@@ -61,6 +61,7 @@ import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Grid;
 import org.zkoss.zul.Listbox;
+import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.SimpleListModel;
@@ -295,6 +296,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
         handler.registerListener(this, page);
         getVisibility().showOnly(listWindow);
         initFilterComponent();
+        setupFilterLimitingResourceListbox();
     }
 
     private void initFilterComponent() {
@@ -694,8 +696,16 @@ public class WorkerCRUDController extends GenericForwardComposer implements
 
     }
 
-    public Set<LimitingResourceEnum> getLimitingResourceFilterOptionList() {
-        return LimitingResourceEnum.getLimitingResourceFilterOptionList();
+    private void setupFilterLimitingResourceListbox() {
+        for(LimitingResourceEnum resourceEnum :
+            LimitingResourceEnum.getLimitingResourceFilterOptionList()) {
+            Listitem item = new Listitem();
+            item.setParent(filterLimitingResource);
+            item.setValue(resourceEnum);
+            item.appendChild(new Listcell(resourceEnum.toString()));
+            filterLimitingResource.appendChild(item);
+        }
+        filterLimitingResource.setSelectedIndex(0);
     }
 
     public Set<LimitingResourceEnum> getLimitingResourceOptionList() {
diff --git a/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul b/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
index 5534f07b8..b2b093bf0 100644
--- a/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
@@ -42,9 +42,7 @@
 
     <!-- Limiting resource -->
     <label value="${i18n:_('Limiting resource')}"/>
-    <listbox id="filterLimitingResource"
-        mold="select"
-        model="@{controller.limitingResourceFilterOptionList}" />
+    <listbox id="filterLimitingResource" mold="select" />
     </hbox>
       </groupbox>