[Erp5-report] r29087 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Sep 17 10:07:40 2009
New Revision: 29087

URL: http://svn.erp5.org?rev=29087&view=rev
Log:
- fix bug #1263. No need to translate portal_type for catalog request.
- add parameter to use other search form than default one. This will permit to reuse this script in other bt (like km) and avoid duplication code. Compatibility should be kept because of the default value.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml?rev=29087&r1=29086&r2=29087&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml [utf8] Thu Sep 17 10:07:40 2009
@@ -64,7 +64,7 @@
   if field_your_search_portal_type == \'all\':\n
     kw.update({\'portal_type\':list(context.getPortalDocumentTypeList())})\n
   else:\n
-    kw.update({\'portal_type\':context.Base_translateString(field_your_search_portal_type)})\n
+    kw.update({\'portal_type\':field_your_search_portal_type})\n
 \n
 web_section = context.getWebSectionValue()\n
 if web_section is not None and \\\n
@@ -75,7 +75,7 @@
 else:\n
   search_context = context.getPortalObject()\n
 \n
-return search_context.Base_redirect(\'ERP5Site_viewSearchResult\', keep_items=kw)\n
+return search_context.Base_redirect(field_your_search_form_id, keep_items=kw)\n
 </string> </value>
         </item>
         <item>
@@ -86,7 +86,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>field_your_search_text=\'\', field_your_search_portal_type=\'\', all_languages=False, list_style=None</string> </value>
+            <value> <string>field_your_search_text=\'\', field_your_search_portal_type=\'\', all_languages=False, list_style=None, field_your_search_form_id=\'ERP5Site_viewSearchResult\'</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -106,7 +106,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>4</int> </value>
+                        <value> <int>5</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -116,6 +116,7 @@
                             <string>field_your_search_portal_type</string>
                             <string>all_languages</string>
                             <string>list_style</string>
+                            <string>field_your_search_form_id</string>
                             <string>kw</string>
                             <string>_getattr_</string>
                             <string>list</string>
@@ -141,6 +142,7 @@
                 <string></string>
                 <int>0</int>
                 <none/>
+                <string>ERP5Site_viewSearchResult</string>
               </tuple>
             </value>
         </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=29087&r1=29086&r2=29087&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Sep 17 10:07:40 2009
@@ -1,1 +1,1 @@
-1301
+1302