From 0dbeebbc8505c3df7bc57129207e903bb065a84a Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Thu, 23 Oct 2014 14:03:25 +1000 Subject: [PATCH] Exclude obsolete project from dashboard: https://bugzilla.redhat.com/show_bug.cgi?id=1082448 --- .../src/main/java/org/zanata/action/DashboardAction.java | 3 ++- zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java | 4 ++++ 2 files changed, 6 insertions(+), 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 index 39ffabd566..91a69ca527 100644 --- 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 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 index f4b66cf36b..b5b87d39b0 100644 --- 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 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) " )