From a874c84594792a79e2705816f396f9aea8936d23 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Tue, 6 Oct 2009 20:14:58 +0200
Subject: [PATCH]  ItEr29S06CUAsignacionGrupoRecursosAPlanificacionItEr28S06:
 [FixBug] Show all workers only when text to search is empty and there are not
 criterions selected

---
 .../web/resources/search/WorkerSearchController.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
index 2fe79bd4d..31456bdc6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
@@ -125,16 +125,16 @@ public class WorkerSearchController extends GenericForwardComposer {
      * @param criterions
      */
     private void searchWorkers(String name, List<Criterion> criterions) {
-        if (name == null || name.length() == 0) {
+        // No text, and no criterions selected
+        if (criterions.isEmpty()
+                && (name == null || name.isEmpty())) {
             refreshListBoxWorkers(workerSearchModel.getAllWorkers());
             return;
         }
 
-        List<Worker> listWorkers = workerSearchModel.findWorkers(name,
-                getSelectedCriterions());
-        refreshListBoxWorkers(listWorkers
-                .toArray(new Worker[listWorkers
-                .size()]));
+        final List<Worker> listWorkers = workerSearchModel.findWorkers(name,
+                criterions);
+        refreshListBoxWorkers(listWorkers);
     }
 
     /**