diff --git a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeContentTranslationSearchQuery.xml b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeContentTranslationSearchQuery.xml index f4c1ff68cc80d08e0cd2046a312a0156f2c69742..1a8787a186ecb0d31e3c4fe114b461e4ec6e4583 100644 --- a/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeContentTranslationSearchQuery.xml +++ b/bt5/erp5_content_translation/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_makeContentTranslationSearchQuery.xml @@ -53,7 +53,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query, SimpleQuery, AndQuery, OrQuery\n + <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query, SimpleQuery, AndQuery\n \n ########### CONFIGURATION ######################################\n # This is a query for search translated properties of Person #\n @@ -61,17 +61,14 @@ ################################################################\n \n query = AndQuery(SimpleQuery(**{\'content_translation.translated_text\': value, \'comparison_operator\': \'match\'}),\n - OrQuery(Query(**{\'content_translation.property_name\': \'first_name\'}),\n - Query(**{\'content_translation.property_name\': \'last_name\'})\n - )\n + Query(**{\'content_translation.property_name\': \'title\'})\n )\n \n ################################################################\n # Above query must make SQL condition like this. #\n ################################################################\n # MATCH(content_translation.translated_text) AGAINST({value})\n -# AND ( content_translation.property_name = \'first_name\'\n -# OR content_translation.property_name = \'last_name\')\n +# AND content_translation.property_name = \'title\'\n \n return query\n </string> </value> @@ -115,7 +112,6 @@ return query\n <string>Query</string> <string>SimpleQuery</string> <string>AndQuery</string> - <string>OrQuery</string> <string>_apply_</string> <string>query</string> </tuple> diff --git a/bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/CatalogTool_getContentTranslationDictList.xml b/bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/CatalogTool_getContentTranslationDictList.xml index 7a95a1c081724bdf51e45750ed627d1cd010326a..e97e740f7d860a4b0f2acfb4e128f2fac06280a0 100644 --- a/bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/CatalogTool_getContentTranslationDictList.xml +++ b/bt5/erp5_content_translation/SkinTemplateItem/portal_skins/erp5_content_translation/CatalogTool_getContentTranslationDictList.xml @@ -60,8 +60,8 @@ # If you want to index properties more, extend property_list #\n # and portal_type_list. #\n ################################################################\n -property_list = (\'first_name\', \'last_name\')\n -portal_type_list = (\'Person\')\n +property_list = (\'title\',)\n +portal_type_list = (\'Person\',)\n \n \n result = []\n diff --git a/bt5/erp5_content_translation/bt/revision b/bt5/erp5_content_translation/bt/revision index b5045cc4046dbc1d7cafa4c603fd3cdf35dc5dde..410b14d2ce6f958c13adcb30807e8673074c49d9 100644 --- a/bt5/erp5_content_translation/bt/revision +++ b/bt5/erp5_content_translation/bt/revision @@ -1 +1 @@ -21 \ No newline at end of file +25 \ No newline at end of file