[Erp5-report] r33307 ivan - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5...

[nobody at svn.erp5.org]

Author: ivan
Date: Wed Mar  3 09:20:36 2010
New Revision: 33307

URL: http://svn.erp5.org?rev=33307&view=rev
Log:
Handle better boolean values which may have been passed by advanced search form.
Filter by contributor title (if passed).

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml?rev=33307&r1=33306&r2=33307&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.xml [utf8] Wed Mar  3 09:20:36 2010
@@ -60,6 +60,7 @@
   It is the reverse of Base_parseSearchString script.\n
 """\n
 MARKER = [\'\', None]\n
+BOOLEAN_MARKER = MARKER + [0]\n
 request = context.REQUEST\n
 \n
 # one can specify a direct search string, \n
@@ -140,12 +141,12 @@
 \n
 # only my docs\n
 mine = kw.get(\'mine\', request.get(\'mine\', None))\n
-if mine not in MARKER:\n
+if mine not in BOOLEAN_MARKER:\n
   search_string += \' mine:yes\'\n
 \n
 # only newest versions\n
 newest =  kw.get(\'newest\', request.get(\'newest\', None))\n
-if newest not in MARKER:\n
+if newest not in BOOLEAN_MARKER:\n
   search_string += \' newest:yes\'\n
 \n
 # search mode\n
@@ -195,6 +196,7 @@
                             <string>kw</string>
                             <string>None</string>
                             <string>MARKER</string>
+                            <string>BOOLEAN_MARKER</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>request</string>

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml?rev=33307&r1=33306&r2=33307&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getAdvancedSearchResultList.xml [utf8] Wed Mar  3 09:20:36 2010
@@ -125,13 +125,16 @@
 if len(where_expression_list):\n
   query_kw[\'where_expression\'] = \' AND \'.join(where_expression_list)\n
 \n
-if parsed_search_string.get(\'mine\'):\n
+if parsed_search_string.get(\'mine\', None) is not None:\n
   # user wants only his documents\n
   query_kw[\'owner\'] = str(portal.portal_membership.getAuthenticatedMember())\n
 \n
-# XXX: add contributor title\n
-\n
-if parsed_search_string.get(\'newest\'):\n
+# add contributor title\n
+contributor_title = parsed_search_string.get(\'contributor_title\', None)\n
+if contributor_title is not None:\n
+  query_kw[\'contributor_title\'] = contributor_title\n
+\n
+if parsed_search_string.get(\'newest\', None) is not None:\n
   #...and now we check for only the newest versions\n
   # but we need to preserve order\n
   query_kw[\'group_by\'] = (\'reference\',)\n
@@ -140,7 +143,6 @@
 else:\n
   result = portal.portal_catalog(**query_kw)\n
 \n
-context.log(portal.portal_catalog(src__=1, **query_kw))\n
 return result\n
 
 
@@ -205,6 +207,7 @@
                             <string>modification_from</string>
                             <string>modification_to</string>
                             <string>str</string>
+                            <string>contributor_title</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>_apply_</string>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=33307&r1=33306&r2=33307&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Wed Mar  3 09:20:36 2010
@@ -1,1 +1,1 @@
-1084
+1085