From dc667704d5d3a02c48fd2c15e08bdc796fe69d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Wed, 19 May 2010 21:01:13 +0200
Subject: [PATCH]  ItEr58S18CUEscaladoPantallaCargaRecursosEmpresaItEr57S10:
 Restore state of the page filter when changing to other screen and coming
 back.

Solves the bug that deletes the content of the combo box in that case.
---
 .../web/resourceload/ResourceLoadController.java  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
index 1fbd5d05d..bb3abd8cc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
@@ -144,11 +144,10 @@ public class ResourceLoadController implements Composer {
     }
 
     public void reload() {
-        // by default show the task by resources
-        boolean filterByResources = true;
         timeTracker = null;
         resourcesLoadPanel = null;
-        reload(filterByResources);
+        firstLoad = true;
+        reload(currentFilterByResources);
     }
 
     private void reload(boolean filterByResources) {
@@ -389,6 +388,9 @@ public class ResourceLoadController implements Composer {
                 item.setDescription(firstName + " - " + lastName);
                 item.setValue(new Integer(position));
                 filterByNameCombo.appendChild(item);
+                if(resourceLoadModel.getPageFilterPosition() == position) {
+                    filterByNameCombo.setSelectedItemApi(item);
+                }
                 position = newPosition;
             }
         }
@@ -398,8 +400,13 @@ public class ResourceLoadController implements Composer {
         lastItem.setDescription(_("Show all elements"));
         lastItem.setValue(new Integer(-1));
         filterByNameCombo.appendChild(lastItem);
+        if(resourceLoadModel.getPageFilterPosition() == -1) {
+            filterByNameCombo.setSelectedItemApi(lastItem);
+        }
 
-        filterByNameCombo.setSelectedIndex(0);
+        if(filterByNameCombo.getSelectedIndex() == -1) {
+            filterByNameCombo.setSelectedIndex(0);
+        }
     }
 
     private void resetAdditionalFilters() {