[Erp5-report] r21496 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web/...

[nobody at svn.erp5.org]

Author: ivan
Date: Wed Jun 11 15:06:16 2008
New Revision: 21496

URL: http://svn.erp5.org?rev=21496&view=rev
Log:
Prevent passing 'portal_type' twice.
Set it explicitly only if it's not contained in kw (for example as list method in a listbox field).

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

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueList.xml?rev=21496&r1=21495&r2=21496&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueList.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueList.xml Wed Jun 11 15:06:16 2008
@@ -122,7 +122,8 @@
   current_section = context.getWebSectionValue()\n
 \n
   # Build the list of parameters\n
-  valid_portal_type_list = portal.getPortalDocumentTypeList()\n
+  if not kw.has_key(\'portal_type\'):\n
+    kw[\'portal_type\'] = portal.getPortalDocumentTypeList()\n
 \n
   if language is None:\n
     language = portal.Localizer.get_selected_language()\n
@@ -137,8 +138,7 @@
     group_by = (\'reference\',)\n
 \n
   # Return the list of matching documents for the given states\n
-  return current_section.searchResults(portal_type=valid_portal_type_list,\n
-                                       language=language,\n
+  return current_section.searchResults(language=language,\n
                                        validation_state=validation_state,\n
                                        sort_on=sort_on,\n
                                        group_by=group_by,\n
@@ -206,7 +206,7 @@
                             <string>portal_catalog</string>
                             <string>context</string>
                             <string>current_section</string>
-                            <string>valid_portal_type_list</string>
+                            <string>_write_</string>
                             <string>None</string>
                             <string>_apply_</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=21496&r1=21495&r2=21496&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Wed Jun 11 15:06:16 2008
@@ -1,1 +1,1 @@
-642
+643