Exclude obsolete project from dashboard: https://bugzilla.redhat.com/…

…show_bug.cgi?id=1082448
zanata · Oct 23, 2014 · 0dbeebb · 0dbeebb
1 parent 6d26d53
commit 0dbeebb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/zanata-war/src/main/java/org/zanata/action/DashboardAction.java b/zanata-war/src/main/java/org/zanata/action/DashboardAction.java
@@ -127,7 +127,8 @@ public Object apply(@NonNull HLocale locale) {
     }
 
     private int countUserMaintainedProjects() {
-        return authenticatedAccount.getPerson().getMaintainerProjects().size();
+        return projectDAO.getMaintainedProjectCount(
+                authenticatedAccount.getPerson(), null);
     }
 
     private List<HProject> fetchUserMaintainedProjects() {

diff --git a/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java b/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
@@ -406,6 +406,8 @@ public List<HProject> getProjectsForMaintainer(HPerson maintainer,
                         .createQuery(
                                 "from HProject p " +
                                 "where :maintainer in elements(p.maintainers) " +
+                                "and p.status <> " +
+                                "'" + EntityStatus.OBSOLETE.getInitial() + "' " +
                                 "and (p.name like :filter " +
                                     "or p.slug like :filter) " +
                                 "order by p.name")
@@ -423,6 +425,8 @@ public int getMaintainedProjectCount(HPerson maintainer, String filter) {
                         .createQuery(
                                 "select count(p) from HProject p " +
                                 "where :maintainer in elements(p.maintainers) " +
+                                "and p.status <> " +
+                                "'" + EntityStatus.OBSOLETE.getInitial() + "' " +
                                 "and (p.name like :filter " +
                                     "or p.slug like :filter) "
                         )