diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_countAdvancedSearchResultList.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_countFullTextSearchResultList.xml similarity index 72% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_countAdvancedSearchResultList.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_countFullTextSearchResultList.xml index 8f31ec0e94e537c2fa61a6f4f89f55fd22a628bc..8ca88473d0f38a481f2f679da9eb45a23e14536f 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_countAdvancedSearchResultList.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_countFullTextSearchResultList.xml @@ -50,26 +50,21 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if search_section_path is not None:\n - section_value = context.getPortalObject().restrictedTraverse(search_section_path)\n - if kw[\'portal_type\'] == [\'Assignment\'] and \\\n - section_value.getMembershipCriterionBaseCategoryList() == [\'follow_up\']:\n - # This is a hack to make sure project members are displayed whenever follow_up base\n - # category is used\n - section_value = section_value.asContext(membership_criterion_base_category = [\'destination_project\'],\n - membership_criterion_category = [section_value.getMembershipCriterionCategory().replace(\'follow_up/\', \'destination_project/\')])\n - return section_value.countResults(**kw)\n + <value> <string>"""\n + Count number of result list of all documents found by specified keyword arguments.\n +"""\n \n +context.log(context.portal_catalog(src__=1, **kw))\n return context.portal_catalog.countResults(**kw)\n </string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>search_section_path=None, **kw</string> </value> + <value> <string>**kw</string> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>WebSite_countAdvancedSearchResultList</string> </value> + <value> <string>WebSite_countFullTextSearchResultList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getAdvancedSearchResultList.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getFullTextSearchResultList.xml similarity index 72% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getAdvancedSearchResultList.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getFullTextSearchResultList.xml index 44be4b011d6b0f9a9321e55273a590841cfe17f0..8d271aa1e5295e81939f30f6ef20759b10310557 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getAdvancedSearchResultList.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km/WebSite_getFullTextSearchResultList.xml @@ -50,26 +50,21 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if search_section_path is not None:\n - section_value = context.getPortalObject().restrictedTraverse(search_section_path)\n - if kw[\'portal_type\'] == [\'Assignment\'] and \\\n - section_value.getMembershipCriterionBaseCategoryList() == [\'follow_up\']:\n - # This is a hack to make sure project members are displayed whenever follow_up base\n - # category is used\n - section_value = section_value.asContext(membership_criterion_base_category = [\'destination_project\'],\n - membership_criterion_category = [section_value.getMembershipCriterionCategory().replace(\'follow_up/\', \'destination_project/\')])\n - return section_value.searchResults(**kw)\n + <value> <string>"""\n + Return the result list of all documents found by specified keyword arguments.\n +"""\n \n +context.log(context.portal_catalog(src__=1, **kw))\n return context.portal_catalog(**kw)\n </string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>search_section_path=None, **kw</string> </value> + <value> <string>**kw</string> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>WebSite_getAdvancedSearchResultList</string> </value> + <value> <string>WebSite_getFullTextSearchResultList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_processAdvancedSearch.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_processAdvancedSearch.xml index 9ac1de1254216f90d54cb0f448dfc05e93cc11d7..df6814439614a6e8eaab04875b80fd6dc05007f3 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_processAdvancedSearch.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_processAdvancedSearch.xml @@ -52,16 +52,14 @@ <key> <string>_body</string> </key> <value> <string>"""\n Puts all the arguments from advanced search dialog form together as \n - a parseable search string. \n + a parse-able search string. \n """\n -request = context.REQUEST\n -portal = context.getPortalObject()\n -searchable_text = context.Base_assembleSearchString()\n -kw[\'list_style\'] = \'search\'\n -kw[\'full_text\'] = searchable_text\n -kw[\'language\'] = \'\'\n kw[\'reset\'] = 1\n -return context.Base_redirect(\'WebSite_viewAdvancedSearchResultList\', keep_items=kw)\n +kw[\'language\'] = \'\'\n +kw[\'list_style\'] = \'search\'\n +kw[\'search_text\'] = context.Base_assembleSearchString()\n +\n +return context.Base_redirect(\'WebSite_viewSearchResultList\', keep_items=kw)\n </string> </value> </item> <item> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKMFieldLibrary/listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKMFieldLibrary/listbox.xml index fd9e9a7cdca6f77c14bfa8cb02bc000a790c10b0..608be8196c34c5ac15579c7ff257f2df93e6b2c8 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKMFieldLibrary/listbox.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKMFieldLibrary/listbox.xml @@ -18,7 +18,6 @@ <string>editable_columns</string> <string>list_method</string> <string>search_columns</string> - <string>selection_name</string> <string>sort_columns</string> <string>title</string> </list> @@ -374,10 +373,6 @@ </list> </value> </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string>document_selection</string> </value> - </item> <item> <key> <string>sort_columns</string> </key> <value> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/assignment_listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/assignment_listbox.xml index 1c77b50c0e4f8d00cc05068d87b3a44eed7e553f..f331aa656bed9411fb4bde32e9d9fce19dcbcbed 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/assignment_listbox.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/assignment_listbox.xml @@ -177,7 +177,7 @@ </item> <item> <key> <string>search</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>select</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/career_listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/career_listbox.xml index 633060d6ae85217a27de137e1f6f7e4420a4e436..b4a29a32c785b898690f5e6457df915d8e52e03e 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/career_listbox.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Person_viewAsWeb/career_listbox.xml @@ -173,7 +173,7 @@ </item> <item> <key> <string>search</string> </key> - <value> <int>0</int> </value> + <value> <int>1</int> </value> </item> <item> <key> <string>select</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_form_id.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_form_id.xml index acc971b7060d99df97f48ed8f14b54bc51303e0d..8503c45bd83515048ad8a954b9f9d218859a7384 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_form_id.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewMinimalKMWidgetFieldLibrary/your_search_form_id.xml @@ -269,7 +269,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>string:WebSite_viewAdvancedSearchResultList</string> </value> + <value> <string>string:WebSite_viewSearchResultList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList.xml similarity index 98% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList.xml index fe847a11472927cf15186eacd484f34a453f765c..73abd6e7ce64f856624b535a7498d36d73a9c400 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList.xml @@ -97,7 +97,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>WebSite_viewAdvancedSearchResultList</string> </value> + <value> <string>WebSite_viewSearchResultList</string> </value> </item> <item> <key> <string>method</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList/listbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList/listbox.xml similarity index 94% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList/listbox.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList/listbox.xml index 77163209e55071ca4a179cc63ee7200f6f052875..6e60a4f0f7219df8c296743b554c5c9acb2a2c1b 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList/listbox.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList/listbox.xml @@ -18,7 +18,6 @@ <string>global_search_column</string> <string>list_method</string> <string>select</string> - <string>selection_name</string> <string>style_columns</string> <string>title</string> </list> @@ -147,7 +146,7 @@ </item> <item> <key> <string>global_search_column</string> </key> - <value> <string>full_text</string> </value> + <value> <string>search_text</string> </value> </item> <item> <key> <string>list_method</string> </key> @@ -159,10 +158,6 @@ <key> <string>select</string> </key> <value> <int>0</int> </value> </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string>web_search_result_selection</string> </value> - </item> <item> <key> <string>style_columns</string> </key> <value> @@ -200,7 +195,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>WebSite_countAdvancedSearchResultList</string> </value> + <value> <string>WebSite_countFullTextSearchResultList</string> </value> </item> </dictionary> </pickle> @@ -213,7 +208,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>WebSite_getAdvancedSearchResultList</string> </value> + <value> <string>WebSite_getFullTextSearchResultList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList/listbox_getSummaryAsHTML.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList/listbox_getSummaryAsHTML.xml similarity index 100% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList/listbox_getSummaryAsHTML.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList/listbox_getSummaryAsHTML.xml diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList/listbox_thumbnail.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList/listbox_thumbnail.xml similarity index 100% rename from bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewAdvancedSearchResultList/listbox_thumbnail.xml rename to bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSite_viewSearchResultList/listbox_thumbnail.xml diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 5cc1348497afbd1b8a2b0bea4d15666413a2dcab..249240adb2d103289082e8c2f5baa30c6d2cd010 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1759 \ No newline at end of file +1761 \ No newline at end of file