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

[nobody at svn.erp5.org]

Author: fabien
Date: Fri Apr 10 15:43:54 2009
New Revision: 26394

URL: http://svn.erp5.org?rev=26394&view=rev
Log:
update ERP5Site_processAdvancedSearch to be able to handle portal_type

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_processAdvancedSearch.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_processAdvancedSearch.xml?rev=26394&r1=26393&r2=26394&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_processAdvancedSearch.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_processAdvancedSearch.xml [utf8] Fri Apr 10 15:43:54 2009
@@ -53,11 +53,24 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>if top_your_search_text is not None:\n
-  your_search_text = top_your_search_text\n
+            <value> <string>translateString = context.Base_translateString\n
+translated_type = \'\'\n
+\n
+if top_your_search_portal_type:\n
+  if top_your_search_portal_type == \'all\':\n
+    return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n
+                                  keep_items=dict(SearchableText=top_your_search_text, reset=1,\n
+                                  your_search_text=top_your_search_text,\n
+                                  portal_type=list(context.getPortalDocumentTypeList()),\n
+                                  list_style = \'search\',\n
+                                  all_languages=all_languages))\n
+\n
+  translated_type = translateString(top_your_search_portal_type)\n
+\n
 return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n
-                            keep_items=dict(SearchableText=your_search_text, reset=1,\n
-                              your_search_text=your_search_text,\n
+                              keep_items=dict(SearchableText=top_your_search_text, reset=1,\n
+                              your_search_text=top_your_search_text,\n
+                              translated_portal_type=translated_type,\n
                               list_style = \'search\',\n
                               all_languages=all_languages))\n
 </string> </value>
@@ -70,7 +83,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>your_search_text=None, top_your_search_text=None, all_languages=False</string> </value>
+            <value> <string>your_search_text=None, top_your_search_text=None, top_your_search_portal_type, all_languages=False</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -90,7 +103,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>3</int> </value>
+                        <value> <int>4</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -98,11 +111,14 @@
                           <tuple>
                             <string>your_search_text</string>
                             <string>top_your_search_text</string>
+                            <string>top_your_search_portal_type</string>
                             <string>all_languages</string>
-                            <string>None</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>translateString</string>
+                            <string>translated_type</string>
                             <string>dict</string>
+                            <string>list</string>
                           </tuple>
                         </value>
                     </item>
@@ -115,6 +131,7 @@
             <key> <string>func_defaults</string> </key>
             <value>
               <tuple>
+                <none/>
                 <none/>
                 <none/>
                 <int>0</int>

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=26394&r1=26393&r2=26394&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Fri Apr 10 15:43:54 2009
@@ -1,1 +1,1 @@
-1150
+1151