diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_processAdvancedSearch.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_processAdvancedSearch.xml index 8c599d545f11f3aac55daf3a0cebe2b8a18c9b55..870ba0ec0b4a01aa3a3ff75492f76ddb883a16ad 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_processAdvancedSearch.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_processAdvancedSearch.xml @@ -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 @@ return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n </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 @@ return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n <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 @@ return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n <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 @@ return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n <key> <string>func_defaults</string> </key> <value> <tuple> + <none/> <none/> <none/> <int>0</int> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index d845103a1861197c4ba6a1b64bbd1fd56806bf23..04170a3632b3d39766d3735a59b34e5e491f10f4 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1150 \ No newline at end of file +1151 \ No newline at end of file