diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml index e3c52423a670803d24164409780e0d725ae51e90..8ac2e382d850b4f6d6e9f4553fbbcc42fb971289 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml @@ -70,8 +70,10 @@ <key> <string>_body</string> </key> <value> <string encoding="cdata"><![CDATA[ +context.log(kw)\n args=context.parseSearchString(kw.get(\'SearchableText\',\'\'))\n -args[\'portal_type\']=context.getPortalDocumentTypeList()\n +if not args.has_key(\'portal_type\') or args[\'portal_type\']==():\n + args[\'portal_type\']=context.getPortalDocumentTypeList()\n cats=[]\n bases=context.portal_categories.getBaseCategoryList()\n for k,v in args.items():\n @@ -163,13 +165,13 @@ return res\n <string>_getattr_</string> <string>context</string> <string>args</string> + <string>_getitem_</string> <string>_write_</string> <string>cats</string> <string>bases</string> <string>_getiter_</string> <string>k</string> <string>v</string> - <string>_getitem_</string> <string>cf</string> <string>ct</string> <string>mf</string> diff --git a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_htmlRepresentation.xml b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_htmlRepresentation.xml index 19de2b5cc5f9bf3637e51c02677c6a2af3115570..d2d36d7f24a4b2a4a6fb7a06c644de4b1e9a9837 100644 --- a/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_htmlRepresentation.xml +++ b/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_htmlRepresentation.xml @@ -63,7 +63,7 @@ <list> <string>a</string> <string>left</string> - <string>bottom</string> + <string>center</string> </list> </value> </item> @@ -78,7 +78,7 @@ </value> </item> <item> - <key> <string>bottom</string> </key> + <key> <string>center</string> </key> <value> <list> <string>html_representation</string> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 030d25b2869afffec1b755ad29fb9a35ad53a952..dd4a90065ceb3d30cc38d69c0e85d96466c90bd1 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -248 \ No newline at end of file +254 \ No newline at end of file