From 4a91d505d42bf3ad2767b4303e61fa6dd816c073 Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Wed, 25 Mar 2009 12:32:33 +0000 Subject: [PATCH] search result url (i.e. submit url from top-right searchbox) was ./ERP5Site_viewSearchResult . But I prefer (portal_url)/ERP5Site_viewSearchResult instead. Because the breadcrumbs in the result page is confusing. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26153 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../ERP5Site_viewQuickSearchResultList.xml | 13 +++++++++++-- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml index 7f941f9ae1..834c702829 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_viewQuickSearchResultList.xml @@ -55,9 +55,15 @@ <key> <string>_body</string> </key> <value> <string>translateString = context.Base_translateString\n translated_type = \'\'\n +\n +if getattr(context, \'getWebSectionValue\', None) is not None:\n + context_search = context.getWebSectionValue()\n +else:\n + context_search = context.getPortalObject()\n +\n if field_your_search_portal_type:\n if field_your_search_portal_type == \'all\':\n - return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n + return context_search.Base_redirect(\'ERP5Site_viewSearchResult\',\n keep_items=dict(SearchableText=field_your_search_text, reset=1,\n your_search_text=field_your_search_text,\n portal_type=list(context.getPortalDocumentTypeList()),\n @@ -66,7 +72,7 @@ if field_your_search_portal_type:\n \n translated_type = translateString(field_your_search_portal_type)\n \n -return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n +return context_search.Base_redirect(\'ERP5Site_viewSearchResult\',\n keep_items=dict(SearchableText=field_your_search_text, reset=1,\n your_search_text=field_your_search_text,\n translated_portal_type=translated_type,\n @@ -116,6 +122,9 @@ return context.Base_redirect(\'ERP5Site_viewSearchResult\',\n <string>context</string> <string>translateString</string> <string>translated_type</string> + <string>getattr</string> + <string>None</string> + <string>context_search</string> <string>dict</string> <string>list</string> </tuple> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 0b078c5a80..a624bd7e25 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1130 \ No newline at end of file +1133 \ No newline at end of file -- 2.30.9