From 7ab8e7f07c404109b8c920f34d8b64d92814285e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Fri, 23 Nov 2012 12:57:55 +0100
Subject: [PATCH] Bug #1541: Fix issue reseting selected element when progress
 is hidden

FEA: ItEr77S04BugFixing
---
 ganttzk/src/main/java/org/zkoss/ganttz/Planner.java            | 3 +++
 .../web/planner/company/CompanyPlanningController.java         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index 08c7a1347..33faee845 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -73,6 +73,7 @@ import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.SimpleListModel;
 import org.zkoss.zul.South;
+import org.zkoss.zul.api.Combobox;
 
 public class Planner extends HtmlMacroComponent  {
 
@@ -636,11 +637,13 @@ public class Planner extends HtmlMacroComponent  {
     public void showAdvances() {
         Button showAdvancesButton = (Button) getFellow("showAdvances");
         if (disabilityConfiguration.isAdvancesEnabled()) {
+            Combobox progressTypesCombo = (Combobox) getFellow("cbProgressTypes");
             if (isShowingAdvances) {
                 context.hideAdvances();
                 diagramGraph.removePostGraphChangeListener(showAdvanceOnChange);
                 showAdvancesButton.setSclass("planner-command");
                 showAdvancesButton.setTooltiptext(_("Show progress"));
+                progressTypesCombo.setSelectedIndex(0);
             } else {
                 context.showAdvances();
                 diagramGraph.addPostGraphChangeListener(showAdvanceOnChange);
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
index d1b6a24fd..4ffcc1402 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
@@ -197,7 +197,7 @@ public class CompanyPlanningController implements Composer {
 
         @Override
         public void render(Comboitem item, Object data) {
-            ProgressType progressType = (ProgressType) data;
+            final ProgressType progressType = (ProgressType) data;
             item.setValue(progressType);
             item.setLabel(_(progressType.getValue()));