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

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Sep 16 12:05:26 2010
New Revision: 38413

URL: http://svn.erp5.org?rev=38413&view=rev
Log:
Do care for syntax not to start with logical operator which should be used only for concatenating two sub search strings.

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_assembleSearchString.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=38413&r1=38412&r2=38413&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] Thu Sep 16 12:05:26 2010
@@ -108,7 +108,11 @@ if portal_type_list:\n
     if \' \' in portal_type:\n
       portal_type = \'"%s"\' %portal_type\n
     portal_type_string_list.append(\'portal_type:%s\' %portal_type)\n
-  search_string += \' %s (%s)\' %(logical_operator, \' OR \'.join(portal_type_string_list))\n
+  portal_type_string = \'(%s)\' %\' OR \'.join(portal_type_string_list)\n
+  if search_string not in MARKER:\n
+    search_string += \' %s %s\' %(logical_operator, portal_type_string)\n
+  else:\n
+    search_string += portal_type_string\n
 \n
 # search by reference\n
 reference = kw.get(\'reference\', request.get(\'reference\', None))\n
@@ -214,6 +218,7 @@ return search_string\n
                             <string>str</string>
                             <string>portal_type_string_list</string>
                             <string>portal_type</string>
+                            <string>portal_type_string</string>
                             <string>reference</string>
                             <string>version</string>
                             <string>language</string>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=38413&r1=38412&r2=38413&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Thu Sep 16 12:05:26 2010
@@ -1 +1 @@
-1175
\ No newline at end of file
+1178
\ No newline at end of file