From 53aebe66a3e953fe86b2b19eb46e89653ce00624 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 21 Aug 2009 09:31:49 +0000 Subject: [PATCH] Fix script again after changes in r28412 to keep current behaviour (list style for search results in non-web mode). git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28538 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_core/ERP5Site_viewQuickSearchResultList.xml | 12 +++++------- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 2 files changed, 6 insertions(+), 8 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 a3d1b3d525..9afd88db2a 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 @@ -66,14 +66,13 @@ if field_your_search_portal_type:\n else:\n kw.update({\'portal_type\':context.Base_translateString(field_your_search_portal_type)})\n \n -getWebSectionValue = getattr(context, \'getWebSectionValue\', None)\n -if getWebSectionValue is not None and \\\n +web_section = context.getWebSectionValue()\n +if web_section is not None and \\\n not bool(context.REQUEST.get(\'ignore_layout\', False)):\n - search_context = getWebSectionValue()\n + search_context = web_section\n if list_style is None:\n kw.update({\'list_style\':\'search\'})\n -\n -if search_context is None:\n +else:\n search_context = context.getPortalObject()\n \n return search_context.Base_redirect(\'ERP5Site_viewSearchResult\', keep_items=kw)\n @@ -121,9 +120,8 @@ return search_context.Base_redirect(\'ERP5Site_viewSearchResult\', keep_items=kw <string>_getattr_</string> <string>list</string> <string>context</string> - <string>getattr</string> + <string>web_section</string> <string>None</string> - <string>getWebSectionValue</string> <string>bool</string> <string>False</string> <string>search_context</string> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 3d32f7d2ce..016faa90f3 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1281 \ No newline at end of file +1282 \ No newline at end of file -- 2.30.9