diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getSearchText.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getSearchText.xml index e5bb6bd1fa1e2391b776a83edaf694c706b82f49..fbca38b8cfa18bda5baaeb9db7ed7a0547ec07e9 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getSearchText.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getSearchText.xml @@ -56,6 +56,7 @@ <value> <string>"""\n Get search text from REQUEST or selection.\n """\n +request = context.REQUEST\n # get search words from listbox selection\n argument_names = (\'advanced_search_text\', \n \'your_search_text\',\n @@ -65,18 +66,16 @@ argument_names = (\'advanced_search_text\', \n \'searchabletext_any\',\n \'searchabletext_all\', \n \'searchabletext_phrase\',)\n -\n if selection is None:\n selection_name = context.REQUEST.get("selection_name", None)\n if selection_name is not None:\n selection = context.portal_selections.getSelectionFor(selection_name)\n \n +params = {}\n if selection is not None:\n params = selection.getParams()\n -else:\n - params = context.portal_selections.getSelectionParamsFor(\'search_result_selection\')\n \n -params = [params.get(name, \'\') for name in argument_names]\n +params = [request.get(name, params.get(name, \'\')) for name in argument_names]\n # flatten value if it is list\n params = [(hasattr(param, \'sort\') and \' \'.join(param) or param) for param in params]\n search_string = \' \'.join(params).strip()\n @@ -119,10 +118,11 @@ return search_string\n <value> <tuple> <string>selection</string> - <string>argument_names</string> - <string>None</string> <string>_getattr_</string> <string>context</string> + <string>request</string> + <string>argument_names</string> + <string>None</string> <string>selection_name</string> <string>params</string> <string>append</string> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 89a8d9ef90f7173116e2c11b3ffba2251ff3b613..29c39c541453055363acc05655a89b663142d7fa 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1623 \ No newline at end of file +1620 \ No newline at end of file