Commit c0c6a0f8 authored by Jérome Perrin's avatar Jérome Perrin

Improvements to WebSection_viewSubjectIndexRenderer, "last_subject =...

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
parent d7d61549
...@@ -73,19 +73,11 @@ context = web_section_value\n ...@@ -73,19 +73,11 @@ context = web_section_value\n
def buildIndex(language=None):\n def buildIndex(language=None):\n
from Products.ZSQLCatalog.SQLCatalog import NegatedQuery, Query\n from Products.ZSQLCatalog.SQLCatalog import NegatedQuery, Query\n
# Retrieve the different subjects in the catalog\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 select_expression=\'subject, reference\',\n
query=NegatedQuery(Query(subject=None)),\n query=NegatedQuery(Query(subject=None)),\n
language=language,\n language=language or \'\',\n
sort_on=((\'subject\', \'descending\'), (\'title\', \'ascending\')),\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 #src__=1,\n
)\n )\n
#return subject_list\n #return subject_list\n
...@@ -109,7 +101,7 @@ def buildIndex(language=None):\n ...@@ -109,7 +101,7 @@ def buildIndex(language=None):\n
subject_title = subject_title[0].upper() + subject_title[1:]\n subject_title = subject_title[0].upper() + subject_title[1:]\n
result.append("<h1>%s</h1>" % subject_title)\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 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 return \'\\n\'.join(result)\n
\n \n
from Products.ERP5Type.Cache import CachingMethod\n from Products.ERP5Type.Cache import CachingMethod\n
......
910 912
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment