[Erp5-report] r33186 jerome - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Mar  1 15:54:14 2010
New Revision: 33186

URL: http://svn.erp5.org?rev=33186&view=rev
Log:
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=''

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml?rev=33186&r1=33185&r2=33186&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewSubjectIndexRenderer.xml [utf8] Mon Mar  1 15:54:14 2010
@@ -73,21 +73,13 @@
 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 @@
       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

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=33186&r1=33185&r2=33186&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Mon Mar  1 15:54:14 2010
@@ -1,1 +1,1 @@
-910
+912