rhbz1060598 - Project search now discards obsolete projects from resu…

…lts for non-admins.
zanata · Feb 6, 2014 · eaa668e · eaa668e
1 parent d5f089d
commit eaa668e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/zanata-model/src/main/java/org/zanata/model/HProject.java b/zanata-model/src/main/java/org/zanata/model/HProject.java
@@ -148,6 +148,7 @@ public class HProject extends SlugEntityBase implements Serializable,
 
     @Type(type = "entityStatus")
     @NotNull
+    @Field
     private EntityStatus status = EntityStatus.ACTIVE;
 
     public void addIteration(HProjectIteration iteration) {

diff --git a/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java b/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
@@ -235,10 +235,8 @@ public List<HProject> searchProjects(@Nonnull String searchQuery,
             int maxResult, int firstResult, boolean includeObsolete)
             throws ParseException {
         FullTextQuery query = getTextQuery(searchQuery, includeObsolete);
-        query.setMaxResults(maxResult).setFirstResult(firstResult)
+        return query.setMaxResults(maxResult).setFirstResult(firstResult)
                 .getResultList();
-
-        return query.getResultList();
     }
 
     public int getQueryProjectSize(@Nonnull String searchQuery,
@@ -264,7 +262,7 @@ private FullTextQuery getTextQuery(@Nonnull String searchQuery,
         if (!includeObsolete) {
             TermQuery obsoleteStateQuery =
                     new TermQuery(new Term(IndexFieldLabels.ENTITY_STATUS,
-                            EntityStatus.OBSOLETE.toString()));
+                            EntityStatus.OBSOLETE.toString().toLowerCase()));
             booleanQuery.add(obsoleteStateQuery, BooleanClause.Occur.MUST_NOT);
         }