Owner column cannot be NONE any longer, so transform NONE into empty string when indexing.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18517 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml

@@ -272,7 +272,7 @@ VALUES\n
   <dtml-sqlvar expr="uid[loop_item]" type="int">,  \n
   <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
   <dtml-sqlvar expr="getPath[loop_item]" type="string">,\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="getRelativeUrl[loop_item]" type="string">,\n
   <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
   <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n
@@ -346,7 +346,7 @@ VALUES\n
   <dtml-sqlvar expr="uid[loop_item]" type="int">,  \n
   <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n
   <dtml-sqlvar expr="getPath[loop_item]" type="string">,\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="getRelativeUrl[loop_item]" type="string">,\n
   <dtml-sqlvar expr="getParentUid[loop_item]" type="int">,\n
   <dtml-sqlvar expr="id[loop_item]" type="string" optional>,\n

bt5/erp5_banking_core/bt/revision

-401
+402
\ No newline at end of file

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.xml

@@ -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 @@ VALUES\n
 (\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 @@ VALUES\n
             <value>
               <object>
                 <klass>
-                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                  <global name="__newobj__" module="copy_reg"/>
                 </klass>
-                <none/>
+                <tuple>
+                  <global name="SQL" module="Shared.DC.ZRDB.DA"/>
+                </tuple>
                 <state>
                   <dictionary>
                     <item>
@@ -436,7 +435,7 @@ VALUES\n
 (\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

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision

-88
+89
\ No newline at end of file