diff --git a/bt5/erp5_dms/ExtensionTemplateItem/DocumentSearch.py b/bt5/erp5_dms/ExtensionTemplateItem/DocumentSearch.py index e06f453ecea11c160c15958763b2b3209ea2295b..6713d0d015edeb2a03255522f3d42df488b16b4e 100644 --- a/bt5/erp5_dms/ExtensionTemplateItem/DocumentSearch.py +++ b/bt5/erp5_dms/ExtensionTemplateItem/DocumentSearch.py @@ -41,7 +41,7 @@ Multiple arguments: - arg:all translates into empty tuple, which implies all available values - state (simulation_state), type (portal_type) -Everything else is treated as SearchableText +Everything else is treated as searchabletext """ # XXX score: @@ -92,12 +92,12 @@ def parsestates(s): return s.replace('"','').replace("'","") def analyze(params): - params['SearchableText']='' + params['searchabletext']='' params['simulation_state']=simulation_states def cutter(s): ss=s.split(':') if len(ss)==1: - params['SearchableText']+=ss[0] + params['searchabletext']+=ss[0] if len(ss)==2: try: ps=paramsmap.get(ss[0])(ss[1]) @@ -116,7 +116,7 @@ def parseSearchString(searchstring): l=r.split(searchstring) print l map(analyze(params),l) - params['SearchableText']=params['SearchableText'].strip() + params['searchabletext']=params['searchabletext'].strip() return params if __name__=='__main__': diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml index d3e76ebdd482aeb000b00d0f16aa3f5f00ec264d..43ffb7aa5b817451cf876e0b7bdc586418db07b8 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml @@ -73,25 +73,25 @@ method.\n """\n req = context.REQUEST\n \n -search_straight = req.get(\'SearchableText\', \'\')\n +search_straight = req.get(\'searchabletext\', \'\')\n if search_straight != \'\':\n return search_straight\n \n # words to search in \'any of the words\' form - left intact\n -search_string = req.get(\'SearchableText_any\',\'\')\n +search_string = req.get(\'searchabletext_any\',\'\')\n \n # exact phrase to search for - double-quoted\n -search_phrase = req.get(\'SearchableText_phrase\',\'\')\n +search_phrase = req.get(\'searchabletext_phrase\',\'\')\n if search_phrase != "":\n search_string += \' "\' + search_phrase + \'"\'\n \n # search "with all of the words" - each word prefixed by "+"\n -search_all = req.get(\'SearchableText_all\',\'\')\n +search_all = req.get(\'searchabletext_all\',\'\')\n if search_all != "":\n search_string += \' \' + \' \'.join(\'+\' + word for word in search_all.split(\' \'))\n \n # search without these words - every word prefixed by "-"\n -search_without = req.get(\'SearchableText_without\',\'\')\n +search_without = req.get(\'searchabletext_without\',\'\')\n if search_without!="":\n search_string += \' \' + \' \'.join(\'-\' + word for word in search_without.split(\' \'))\n \n diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml index 25738469d7234075745ed36bcc8320f994fd5ebb..25b0dfab674bd2fcf56bd074a6b835b2534bd99a 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml @@ -68,7 +68,7 @@ <value> <string encoding="cdata"><![CDATA[ """\n -The main search script. Receives one big string - a SearchableText, in\n +The main search script. Receives one big string - a searchabletext, in\n the search syntax, parses the string using external method Base_parseSearchString,\n then does the following:\n - processes arguments for searching by any category\n @@ -80,17 +80,17 @@ then does the following:\n """\n \n # if no args we return empty list\n -# we use only SearchableText - all params are passed through this\n +# we use only searchabletext - all params are passed through this\n \n -# SearchableText can be supplied in request or stored in selection\n -sstr = context.REQUEST.get(\'SearchableText\')\n +# searchabletext can be supplied in request or stored in selection\n +sstr = context.REQUEST.get(\'searchabletext\')\n \n if sstr:\n - context.portal_selections.setSelectionParamsFor(\'search_params_selection\', dict(SearchableText=sstr))\n + context.portal_selections.setSelectionParamsFor(\'search_params_selection\', dict(searchabletext=sstr))\n else:\n params = context.portal_selections.getSelectionParamsFor(\'search_params_selection\')\n if params:\n - sstr = params.get(\'SearchableText\')\n + sstr = params.get(\'searchabletext\')\n \n if not sstr: return []\n \n @@ -116,13 +116,13 @@ if not args.has_key(\'portal_type\') or args[\'portal_type\'] == ():\n # args[\'SearchableText\'] = dict(query=args[\'SearchableText\'], search_mode=modemap[mode])\n \n # we always do boolean because we want these options in search dialog\n -args[\'SearchableText\'] = dict(query=args[\'SearchableText\'], search_mode=\'in_boolean_mode\')\n +args[\'searchabletext\'] = dict(query=args[\'searchabletext\'], search_mode=\'in_boolean_mode\')\n \n # a hack because SQLCatalog wants table.key now \n # dunno if it is a bug or a feature\n -if args.has_key(\'SearchableText\'):\n - args[\'full_text.SearchableText\'] = args[\'SearchableText\']\n - args.pop(\'SearchableText\')\n +if args.has_key(\'searchabletext\'):\n + args[\'full_text.SearchableText\'] = args[\'searchabletext\']\n + args.pop(\'searchabletext\')\n \n cf = args.get(\'creation_from\')\n ct = args.get(\'creation_to\')\n diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml index ab4b0a26bf50a5bdfc690c1256ee4b168df19326..32328d1f6ee586462875a4fb71b73c2de3761a3c 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_processAdvancedSearch.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> </tuple> </pickle> <pickle> @@ -76,7 +73,7 @@ req = context.REQUEST\n sstr = context.Base_assembleSearchString()\n \n -req.set(\'SearchableText\', sstr)\n +req.set(\'searchabletext\', sstr)\n return context.Base_viewAdvancedSearchResultList()\n </string> </value> </item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml index 2199aeb0f52ec43496fed08be215fdada8f5a536..d02ab14ad240fa60ce8e3ccb7bf3418cea7e80a5 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_showFoundText.xml @@ -82,10 +82,10 @@ if hasattr(context, \'asText\'):\n argument_names = (\'advanced_search_text\', \n \'title\',\n \'reference\',\n - \'SearchableText\', \n - \'SearchableText_any\',\n - \'SearchableText_all\', \n - \'SearchableText_phrase\',)\n + \'searchabletext\', \n + \'searchabletext_any\',\n + \'searchabletext_all\', \n + \'searchabletext_phrase\',)\n if selection is not None:\n params = selection.getParams()\n else:\n @@ -101,7 +101,7 @@ if not search_string:\n return document_text[:300]\n \n search_argument_list = context.Base_parseSearchString(search_string)\n -search_words = search_argument_list.get(\'SearchableText\')\n +search_words = search_argument_list.get(\'searchabletext\')\n \n if search_words in (\'\', None,):\n # the searched words are empty (e.g. because we used only parameters \n diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog.xml index b539e5138e4673b1d3472100af2c84a520c74032..92d320a00edf16eb7916b102ca5bd70eb4126f4a 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.ERP5Form.Form</string> - <string>ERP5Form</string> - </tuple> - <none/> + <global name="ERP5Form" module="Products.ERP5Form.Form"/> + <tuple/> </tuple> </pickle> <pickle> @@ -94,13 +91,13 @@ <key> <string>left</string> </key> <value> <list> - <string>SearchableText_any</string> - <string>SearchableText_all</string> - <string>SearchableText_phrase</string> - <string>SearchableText_without</string> + <string>your_searchabletext_any</string> + <string>your_searchabletext_all</string> + <string>your_searchabletext_phrase</string> + <string>your_searchabletext_without</string> <string>my_search_portal_type</string> - <string>creation_from</string> - <string>creation_to</string> + <string>your_creation_from</string> + <string>your_creation_to</string> </list> </value> </item> @@ -108,11 +105,11 @@ <key> <string>right</string> </key> <value> <list> - <string>reference</string> - <string>version</string> - <string>language</string> - <string>mine</string> - <string>newest</string> + <string>your_reference</string> + <string>your_version</string> + <string>your_language</string> + <string>your_mine</string> + <string>your_newest</string> <string>my_created_within</string> </list> </value> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/creation_from.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_creation_from.xml similarity index 99% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/creation_from.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_creation_from.xml index 60c31d0736443103300d0a1d4179e6f6ad44b3f3..3c25bac4ab1a6c8dd964224a857b49b7b0492204 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/creation_from.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_creation_from.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>DateTimeField</string> - </tuple> - <none/> + <global name="DateTimeField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>creation_from</string> </value> + <value> <string>your_creation_from</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/creation_to.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_creation_to.xml similarity index 99% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/creation_to.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_creation_to.xml index 76f75faef5e1a4a470ee41636251b450f0e7d3b7..fad043c7e6e7ff11d231ca588fefc7a85cc2fd3e 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/creation_to.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_creation_to.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>DateTimeField</string> - </tuple> - <none/> + <global name="DateTimeField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>creation_to</string> </value> + <value> <string>your_creation_to</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/language.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_language.xml similarity index 98% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/language.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_language.xml index 43921e4bdaea10a12bb14b1b5880e0d46b33c068..f4062de2b63b192ced8beadbfcd877355afbfbc8 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/language.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_language.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>ListField</string> - </tuple> - <none/> + <global name="ListField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>language</string> </value> + <value> <string>your_language</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/mine.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_mine.xml similarity index 96% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/mine.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_mine.xml index 896b650f9ae2b9a2df43c05aad3f123b82d8071e..382159a0baeb370bdfcd8c304084b376697aa041 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/mine.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_mine.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>CheckBoxField</string> - </tuple> - <none/> + <global name="CheckBoxField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>mine</string> </value> + <value> <string>your_mine</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/newest.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_newest.xml similarity index 96% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/newest.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_newest.xml index 4f3516503c70b86321ad5d5bfc4cdcdaa7b54849..2ec601f6c6f05fa10cd62040ccddf3a4a5281cee 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/newest.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_newest.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>CheckBoxField</string> - </tuple> - <none/> + <global name="CheckBoxField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> @@ -20,7 +17,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>newest</string> </value> + <value> <string>your_newest</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/reference.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_reference.xml similarity index 97% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/reference.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_reference.xml index 5b26a8beb7e41b54247bc3972ab72245242d21a2..d21981ecd9fd35d9d9f7a848608d3bd5bb87727a 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/reference.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_reference.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>StringField</string> - </tuple> - <none/> + <global name="StringField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>reference</string> </value> + <value> <string>your_reference</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_all.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_all.xml similarity index 97% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_all.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_all.xml index 2f937932fe1d2f389f380042fce321228152a743..b0dc54d34db5c9d0bd7eac84c05a5205f55d6cdc 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_all.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_all.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>StringField</string> - </tuple> - <none/> + <global name="StringField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>SearchableText_all</string> </value> + <value> <string>your_searchabletext_all</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_any.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_any.xml similarity index 97% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_any.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_any.xml index cc0c505ecb8139259e43c9eb4654bb0ac2facac8..ed32d947a57fb4f45e24a217b18382a89765a498 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_any.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_any.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>StringField</string> - </tuple> - <none/> + <global name="StringField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>SearchableText_any</string> </value> + <value> <string>your_searchabletext_any</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_phrase.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_phrase.xml similarity index 97% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_phrase.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_phrase.xml index aeaa852269efd188dd2a5262a59c48c57e950c8c..49391e9954946cb6dd752ecedf565a9ce603c6f4 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_phrase.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_phrase.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>StringField</string> - </tuple> - <none/> + <global name="StringField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>SearchableText_phrase</string> </value> + <value> <string>your_searchabletext_phrase</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_without.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_without.xml similarity index 97% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_without.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_without.xml index 51d6c0f5dcce5bb3b103810ccb4b85c4a1d8970e..091a42c734caafe031aaa238951ac1485ddcbf63 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/SearchableText_without.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_searchabletext_without.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>StringField</string> - </tuple> - <none/> + <global name="StringField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>SearchableText_without</string> </value> + <value> <string>your_searchabletext_without</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/version.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_version.xml similarity index 98% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/version.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_version.xml index 6e2df042fcc093e01d6fe49920086fa8f6eda098..4bb1a113b435a7535f9f4cb47a469effc17768e4 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/version.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_viewAdvancedSearchDialog/your_version.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>StringField</string> - </tuple> - <none/> + <global name="StringField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> @@ -20,7 +17,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>version</string> </value> + <value> <string>your_version</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog.xml index bc83e7605c716965c411f97faecfbb42bc76d45b..690af3d81887128c63fc5d09e40a483f49037b0e 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog.xml @@ -95,7 +95,7 @@ <key> <string>left</string> </key> <value> <list> - <string>SearchableText</string> + <string>your_searchabletext</string> </list> </value> </item> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog/SearchableText.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog/your_searchabletext.xml similarity index 97% rename from bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog/SearchableText.xml rename to bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog/your_searchabletext.xml index d57f413df604212c436f2c4a32b4acb46fd1359b..4ac12891eee40dab6ad7cab465604babc69f1960 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog/SearchableText.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DocumentModule_viewSearchDialog/your_searchabletext.xml @@ -3,18 +3,15 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>StringField</string> - </tuple> - <none/> + <global name="StringField" module="Products.Formulator.StandardFields"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>id</string> </key> - <value> <string>SearchableText</string> </value> + <value> <string>your_searchabletext</string> </value> </item> <item> <key> <string>message_values</string> </key> diff --git a/bt5/erp5_dms/bt/change_log b/bt5/erp5_dms/bt/change_log index bfb2290adc7b0dc5548fc3621f96f8fd9552b90d..69ef31c2fe86ea8cebd7a9e77b62cede710626a4 100644 --- a/bt5/erp5_dms/bt/change_log +++ b/bt5/erp5_dms/bt/change_log @@ -1,3 +1,6 @@ +2007-12-18 Yusei +* Fixed wrong field names around search dialog. + 2007-12-11 Yusei * Fixed dependencies. erp5_dms depends on erp5_crm. Because Document Ingestion Message is based on Event portal type. diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 988e00fe6b2996b85c3c171cf2b3bed3e896795a..c1891366fdb411c94d98138ed52fef2e57a2676c 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -768 \ No newline at end of file +769 \ No newline at end of file