From 305feae36f77b9f617d16eb35cdf7a24a5c6edc8 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 22 Sep 2017 06:19:30 +0000 Subject: [PATCH] NativeSQL Lists: Count statement did not use negoiated language git-svn-id: https://svn.libreccm.org/ccm/trunk@5005 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/sciproject/navigation/SciProjectList.java | 5 ++++- .../cms/scipublications/navigation/PublicationList.java | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java b/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java index a1706d9cf..bf3101e1d 100644 --- a/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java +++ b/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java @@ -44,7 +44,7 @@ public class SciProjectList extends AbstractComponent { + "JOIN cms_pages ON cms_items.item_id = cms_pages.item_id " + "JOIN content_types ON cms_items.type_id = content_types.type_id " + "JOIN ct_sci_projects ON cms_items.item_id = ct_sci_projects.project_id " - + "WHERE parent_id IN (SELECT object_id FROM cat_object_category_map WHERE category_id = ?) AND version = 'live' %s"; + + "WHERE parent_id IN (SELECT object_id FROM cat_object_category_map WHERE category_id = ?) AND language = ? AND version = 'live' %s"; private final PreparedStatement projectMembersQueryStatement; @@ -177,6 +177,9 @@ public class SciProjectList extends AbstractComponent { whereBuffer.toString())); countProjectQueryStatement.setString(1, categoryId); + countProjectQueryStatement.setString(2, GlobalizationHelper + .getNegotiatedLocale() + .toString()); final ResultSet countResultSet = countProjectQueryStatement .executeQuery(); final int count; diff --git a/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java b/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java index 783eb6654..8d1aa8f13 100644 --- a/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java +++ b/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java @@ -109,7 +109,7 @@ public class PublicationList extends AbstractComponent { + "LEFT JOIN ct_unpublished ON ct_publications.publication_id = ct_unpublished.unpublished_id " + "LEFT JOIN ct_grey_literature ON ct_unpublished.unpublished_id = ct_grey_literature.grey_literature_id " + "%s" - + "WHERE parent_id IN (SELECT object_id FROM cat_object_category_map WHERE category_id = ?) AND version = 'live' %s"; + + "WHERE parent_id IN (SELECT object_id FROM cat_object_category_map WHERE category_id = ?) AND language = ? AND version = 'live' %s"; /** * Prepared statement for fetching the available years of publication for @@ -285,7 +285,7 @@ public class PublicationList extends AbstractComponent { final int page; final int offset; try { - final String titleFilter = Globalization.decodeParameter(request, + final String titleFilter = Globalization.decodeParameter(request, "title"); // final String titleFilter = request.getParameter("title"); final Integer yearFilter; @@ -422,6 +422,9 @@ public class PublicationList extends AbstractComponent { whereBuffer.toString())); countPublicationsQueryStatement.setString(1, categoryId); + countPublicationsQueryStatement.setString(2, GlobalizationHelper + .getNegotiatedLocale() + .getLanguage()); final ResultSet countResultSet = countPublicationsQueryStatement .executeQuery(); final int count;