[Erp5-report] r18516 - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog: Ca...

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Dec 26 12:19:32 2007
New Revision: 18516

URL: http://svn.erp5.org?rev=18516&view=rev
Log:
Owner column cannot be NONE any longer, so transform NONE into empty string when indexing.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml?rev=18516&r1=18515&r2=18516&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml Wed Dec 26 12:19:32 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ZSQLMethods.SQL</string>
-          <string>SQL</string>
-        </tuple>
-        <none/>
+        <global name="SQL" module="Products.ZSQLMethods.SQL"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -354,7 +351,7 @@
 (\n
   <dtml-sqlvar expr="uid[loop_item]" type="int">,  \n
   <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
-  <dtml-sqlvar expr="getViewPermissionOwner[loop_item]" type="string" optional>,\n
+  <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or \'\'" type="string" optional>,\n
   <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
   <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
   <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
@@ -395,9 +392,11 @@
             <value>
               <object>
                 <klass>
+                  <global name="__newobj__" module="copy_reg"/>
+                </klass>
+                <tuple>
                   <global name="SQL" module="Shared.DC.ZRDB.DA"/>
-                </klass>
-                <none/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
@@ -436,7 +435,7 @@
 (\n
   <dtml-sqlvar expr="uid[loop_item]" type="int">,  \n
   <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
-  <dtml-sqlvar expr="getViewPermissionOwner[loop_item]" type="string" optional>,\n
+  <dtml-sqlvar expr="(getViewPermissionOwner[loop_item] is not None) and getViewPermissionOwner[loop_item] or \'\'" type="string" optional>,\n
   <dtml-sqlvar expr="getPath[loop_item]" type="string">,\n
   <dtml-sqlvar expr="getRelativeUrl[loop_item]" type="string">,\n
   <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision?rev=18516&r1=18515&r2=18516&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision Wed Dec 26 12:19:32 2007
@@ -1,1 +1,1 @@
-88
+89