From c0c6a0f8e84658a22008c0626cd39aa14fa83d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 1 Mar 2010 14:54:14 +0000 Subject: [PATCH] Improvements to WebSection_viewSubjectIndexRenderer, "last_subject = subject.subject" was missing, so grouping was not done. Also use the fact that catalog ignores empty string to pass language='' git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33186 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../WebSection_viewSubjectIndexRenderer.xml | 18 +++++------------- bt5/erp5_web/bt/revision | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml index 59693110a8..fd0c5e6eb6 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml @@ -73,21 +73,13 @@ context = web_section_value\n def buildIndex(language=None):\n from Products.ZSQLCatalog.SQLCatalog import NegatedQuery, Query\n # Retrieve the different subjects in the catalog\n - if language is not None:\n - subject_list = context.searchResults(\n + subject_list = context.searchResults(\n select_expression=\'subject, reference\',\n query=NegatedQuery(Query(subject=None)),\n - language=language,\n - sort_on=((\'subject\', \'descending\'), (\'title\', \'ascending\')),\n + language=language or \'\',\n + sort_on=((\'subject\', \'ascending\'), (\'title\', \'ascending\')),\n #src__=1,\n - )\n - else:\n - subject_list = context.searchResults(\n - select_expression=\'subject, reference\',\n - query=NegatedQuery(Query(subject=None)),\n - sort_on=((\'subject\', \'descending\'), (\'title\', \'ascending\')),\n - #src__=1,\n - )\n + )\n #return subject_list\n #return map(lambda x:(x.subject, x.reference), subject_list)\n # Convert the result into list\n @@ -109,7 +101,7 @@ def buildIndex(language=None):\n subject_title = subject_title[0].upper() + subject_title[1:]\n result.append("<h1>%s</h1>" % subject_title)\n result.append("""<p><a href="%s/%s/view">%s</a></p>""" % (web_section_url, subject.reference, subject.title))\n -\n + last_subject = subject.subject\n return \'\\n\'.join(result)\n \n from Products.ERP5Type.Cache import CachingMethod\n diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 2379a17515..da77ca67a5 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -910 \ No newline at end of file +912 \ No newline at end of file -- 2.30.9