From 40ec28426ecc135f95d3f8b400f7bcbc4096256f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Tue, 20 Sep 2011 20:18:43 +0200
Subject: [PATCH] [Bug #1185] Fixed combobox problems with selector for
 progress types

FEA: ItEr75S04BugFixing
---
 .../web/planner/company/CompanyPlanningController.java    | 8 ++++++--
 .../src/main/webapp/common/css/navalplan_zk.css           | 6 +++++-
 2 files changed, 11 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 e625283dc..b7c72ddd5 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
@@ -56,6 +56,7 @@ import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.ComboitemRenderer;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Datebox;
+import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.SimpleListModel;
 import org.zkoss.zul.Vbox;
 
@@ -137,14 +138,16 @@ 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()));
         cbProgressTypes.setItemRenderer(new ProgressTypeRenderer());
 
         // FIXME: Select default configuration option
-        // cbProgressTypes.renderAll();
         cbProgressTypes.invalidate();
+
         Comboitem item = findListitemValue(cbProgressTypes,
                 getProgressTypeFromConfiguration());
+
         if (item != null) {
             cbProgressTypes.setSelectedItem(item);
         }
@@ -164,6 +167,7 @@ public class CompanyPlanningController implements Composer {
         });
 
         cbProgressTypes.setVisible(true);
+
     }
 
     private static class ProgressTypeRenderer implements ComboitemRenderer {
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 1fce238e6..b3f557e1a 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -1431,7 +1431,7 @@ display:none;
 
 .progress-types.z-combobox {
     position: relative;
-    left: -3px;
+    left: -9px;
 }
 
 .progress-types {
@@ -1450,6 +1450,10 @@ display:none;
     text-indent: -200px;
 }
 
+.progress-types.z-combobox input {
+    display: none;
+}
+
 .show-advances img  {
     position:relative;
     left: -6px;