From 1aba98bde176ae553a9f6d8a602e47cd1d78f8bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Tue, 8 Dec 2009 21:37:21 +0100
Subject: [PATCH]  ItEr38S08CUAdministracionCategoriaCosteItEr37S12: only
 active CostCategories appear in the ResourcesCostCategoryAssignment
 autocomplete box

---
 .../costcategories/daos/CostCategoryDAO.java     | 16 ++++++++++++++++
 .../costcategories/daos/ICostCategoryDAO.java    |  4 ++++
 .../components/finders/CostCategoryFinder.java   |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/CostCategoryDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/CostCategoryDAO.java
index ca1042d18..5c04b4302 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/CostCategoryDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/CostCategoryDAO.java
@@ -20,6 +20,11 @@
 
 package org.navalplanner.business.costcategories.daos;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Restrictions;
 import org.navalplanner.business.common.daos.GenericDAOHibernate;
 import org.navalplanner.business.costcategories.entities.CostCategory;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -34,4 +39,15 @@ import org.springframework.stereotype.Repository;
 public class CostCategoryDAO extends GenericDAOHibernate<CostCategory, Long>
         implements ICostCategoryDAO {
 
+
+    @Override
+    public List<CostCategory> findActive() {
+
+        Criteria c = getSession().createCriteria(CostCategory.class);
+        c.add(Restrictions.eq("enabled", true));
+
+        List<CostCategory> list = new ArrayList<CostCategory>();
+        list.addAll(c.list());
+        return list;
+    }
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ICostCategoryDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ICostCategoryDAO.java
index b8b6b6d0d..aad493536 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ICostCategoryDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ICostCategoryDAO.java
@@ -20,6 +20,8 @@
 
 package org.navalplanner.business.costcategories.daos;
 
+import java.util.List;
+
 import org.navalplanner.business.common.daos.IGenericDAO;
 import org.navalplanner.business.costcategories.entities.CostCategory;
 
@@ -28,4 +30,6 @@ import org.navalplanner.business.costcategories.entities.CostCategory;
  */
 public interface ICostCategoryDAO extends IGenericDAO<CostCategory, Long> {
 
+    List<CostCategory> findActive();
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CostCategoryFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CostCategoryFinder.java
index 8ad62e1e1..ccfe891ea 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CostCategoryFinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CostCategoryFinder.java
@@ -44,7 +44,7 @@ public class CostCategoryFinder extends Finder implements IFinder {
 
     @Transactional(readOnly = true)
     public List<CostCategory> getAll() {
-        return dao.list(CostCategory.class);
+        return dao.findActive();
     }
 
     @Override