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 7ea06d939b544aaedca3d4b5251a258f79c2a652..52054cf24b237ca64faa05eb981a5929b5554173 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 @@ -100,6 +100,14 @@ modemap={\'natural\':0,\'boolean\':\'in_boolean_mode\',\'expanded\':\'with_query if mode and modemap.has_key(mode):\n args[\'search_mode\']=modemap[mode]\n \n +# user wants only his documents - we try to use Creator from compatibility table\n +if args.get(\'mine\'): \n + context.log(\'mine\')\n + from AccessControl import getSecurityManager\n + sm=getSecurityManager()\n + u=sm.getUser()\n + args[\'Creator\']=str(u)\n +\n kw.update(args)\n \n # a hack because SQLCatalog wants table.key now \n @@ -132,14 +140,14 @@ context.log(\'SEARCH:\',args)\n res=context.portal_catalog(**kw)\n \n # user wants only his documents\n -if args.get(\'mine\'): \n - context.log(\'mine\')\n - from AccessControl import getSecurityManager\n - sm=getSecurityManager()\n - u=sm.getUser()\n - # now we need to filter by owner\n - # some day we will do it in catalog\n - res=[r for r in res if u.allowed(r.getObject(),(\'Owner\',))]\n +#if args.get(\'mine\'): \n +# context.log(\'mine\')\n +# from AccessControl import getSecurityManager\n +# sm=getSecurityManager()\n +# u=sm.getUser()\n +# # now we need to filter by owner\n +# # some day we will do it in catalog\n +# res=[r for r in res if u.allowed(r.getObject(),(\'Owner\',))]\n \n #...and now we check for only the newest versions\n # but we need to preserve order\n @@ -231,24 +239,22 @@ return res\n <string>v</string> <string>mode</string> <string>modemap</string> + <string>AccessControl</string> + <string>getSecurityManager</string> + <string>sm</string> + <string>u</string> + <string>str</string> <string>cf</string> <string>ct</string> <string>mf</string> <string>mt</string> <string>wheres</string> - <string>str</string> <string>_apply_</string> <string>res</string> - <string>AccessControl</string> - <string>getSecurityManager</string> - <string>sm</string> - <string>u</string> - <string>append</string> - <string>$append0</string> - <string>r</string> <string>idx</string> <string>newest</string> <string>counter</string> + <string>r</string> <string>ref</string> <string>int</string> <string>ver</string> diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision index 5f1a9f39c27866e19c2665f899cec7d843660ad4..95738485793d46fac341b01b1f8f9468b4df0dd1 100644 --- a/bt5/erp5_dms/bt/revision +++ b/bt5/erp5_dms/bt/revision @@ -1 +1 @@ -324 \ No newline at end of file +326 \ No newline at end of file