[Erp5-report] r10423 - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5_dms/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 28 21:46:32 CEST 2006
Author: bartek
Date: Thu Sep 28 21:46:30 2006
New Revision: 10423
URL: http://svn.erp5.org?rev=10423&view=rev
Log:
option "search only my documents" in advanced search (rotten implementation, though)
Added:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/mine.xml
erp5/trunk/bt5/erp5_dms/bt/short_title
Modified:
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml
erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog.xml
erp5/trunk/bt5/erp5_dms/bt/revision
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml?rev=10423&r1=10422&r2=10423&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_getAdvancedSearchResults.xml Thu Sep 28 21:46:30 2006
@@ -79,8 +79,13 @@
cats.append(\'/\'.join((k,v)))\n
if cats!=[]:\n
args[\'category\']=cats\n
-context.log(\'args\',args)\n
kw.update(args)\n
+\n
+# a hack because SQLCatalog wants table.key now \n
+# dunno if it is a bug or a feature\n
+if kw.has_key(\'SearchableText\'):\n
+ kw[\'full_text.SearchableText\']=kw[\'SearchableText\']\n
+ kw.pop(\'SearchableText\')\n
\n
cf=kw.get(\'creation_from\')\n
ct=kw.get(\'creation_to\')\n
@@ -98,8 +103,18 @@
wheres.append(\'modification_date<"\'+str(mt)+\'"\')\n
if wheres!=[]:\n
kw[\'where_expression\']=\' AND \'.join(wheres)\n
-context.log(\'wheres\',kw.get(\'where_expression\',\'x\'))\n
-return context.portal_catalog(**kw)\n
+\n
+res=context.portal_catalog(**kw)\n
+\n
+if kw.get(\'mine\')==1: # user wants only his documents\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,(\'Owner\',))]\n
+\n
+return res\n
]]></string> </value>
@@ -154,6 +169,7 @@
<string>_getiter_</string>
<string>k</string>
<string>v</string>
+ <string>_getitem_</string>
<string>cf</string>
<string>ct</string>
<string>mf</string>
@@ -161,6 +177,14 @@
<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>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog.xml?rev=10423&r1=10422&r2=10423&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog.xml Thu Sep 28 21:46:30 2006
@@ -76,6 +76,7 @@
<list>
<string>SearchableText</string>
<string>search_mode</string>
+ <string>mine</string>
</list>
</value>
</item>
Added: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/mine.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/mine.xml?rev=10423&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/mine.xml (added)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/DMS_searchDialog/mine.xml Thu Sep 28 21:46:30 2006
@@ -1,0 +1,174 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.StandardFields</string>
+ <string>CheckBoxField</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>mine</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Only my documents</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=10423&r1=10422&r2=10423&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Thu Sep 28 21:46:30 2006
@@ -1,1 +1,1 @@
-219
+221
Added: erp5/trunk/bt5/erp5_dms/bt/short_title
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/short_title?rev=10423&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/short_title (added)
+++ erp5/trunk/bt5/erp5_dms/bt/short_title Thu Sep 28 21:46:30 2006
@@ -1,0 +1,1 @@
+None
More information about the Erp5-report
mailing list