From 6c0662e9ceccd5c5af9d1094c77744744ca796bc Mon Sep 17 00:00:00 2001
From: Farruco Sanjurjo <fsanjurjo@igalia.com>
Date: Tue, 1 Feb 2011 10:15:22 +0100
Subject: [PATCH] Fixed bug related with the model used with a combobox

* If we use a SimpleListModel the combobox will be empty (because the SimpleListModel extends from ListSubModel)
* Replaced with ListModelList

FEA: ItEr02S03MigracionZK5
---
 .../web/planner/company/CompanyPlanningController.java       | 5 +++--
 .../src/main/webapp/common/css/navalplan_zk.css              | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
index 71dd966df..be052e27b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
@@ -57,7 +57,7 @@ import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Datebox;
-import org.zkoss.zul.SimpleListModel;
+import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.Vbox;
 
 /**
@@ -144,7 +144,8 @@ public class CompanyPlanningController implements Composer {
         if (cbProgressTypes == null) {
             cbProgressTypes = (Combobox) planner.getFellow("cbProgressTypes");
         }
-        cbProgressTypes.setModel(new SimpleListModel(ProgressType.getAll()));
+        cbProgressTypes.setModel(new ListModelList(ProgressType.getAll()));
+
 
         // FIXME: Select default configuration option
         // cbProgressTypes.renderAll();
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index 26b6efe90..c38e2fdb0 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -1507,7 +1507,7 @@ display:none;
     left: -8px;
 }
 
-.progress-types.z-combobox .z-combobox-img {
+.progress-types.z-combobox .z-combobox-btn {
     background-image: url(../img/small-combo-arrow.png);
     border: 0;
 }
\ No newline at end of file