Rename owner column to viewable_owner.

Add owner column which always contain the owner id of the object.

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

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

@@ -113,6 +113,12 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>getOwnerInfo</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>getParentUid</string> </key>
                                 <value>
@@ -224,6 +230,7 @@
                           <list>
 <string>uid</string>
 <string>security_uid</string>
+<string>getOwnerInfo</string>
 <string>getViewPermissionOwner</string>
 <string>getPath</string>
 <string>getRelativeUrl</string>
@@ -271,6 +278,7 @@
             <key> <string>arguments_src</string> </key>
             <value> <string>uid\r\n
 security_uid\r\n
+getOwnerInfo\r\n
 getViewPermissionOwner\r\n
 getPath\r\n
 getRelativeUrl\r\n
@@ -341,7 +349,7 @@ getModificationDate</string> </value>
 
 REPLACE INTO\n
   catalog\n
-  (`uid`, `security_uid`, `owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,\n
+  (`uid`, `security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,\n
    `portal_type`, `opportunity_state`, `corporate_registration_code`, `ean13_code`, `validation_state`, `simulation_state`,\n
    `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`,\n
    `source_reference`, `destination_reference`, `string_index`, `int_index`, `float_index`, `has_cell_content`, `creation_date`,\n
@@ -351,6 +359,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="getOwnerInfo[loop_item][\'id\']" type="string">,\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
@@ -425,7 +434,7 @@ VALUES\n
 
 REPLACE INTO\n
   catalog\n
-  (`uid`, `security_uid`, `owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,\n
+  (`uid`, `security_uid`, `owner`, `viewable_owner`, `path`, `relative_url`, `parent_uid`, `id`, `description`, `title`, `meta_type`,\n
    `portal_type`, `opportunity_state`, `corporate_registration_code`, `ean13_code`, `validation_state`, `simulation_state`,\n
    `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`,\n
    `source_reference`, `destination_reference`, `string_index`, `int_index`, `float_index`, `has_cell_content`, `creation_date`,\n
@@ -435,6 +444,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="getOwnerInfo[loop_item][\'id\']" type="string">,\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

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

@@ -96,6 +96,7 @@ CREATE TABLE `catalog` (\n
   `uid` BIGINT UNSIGNED NOT NULL,\n
   `security_uid` INT UNSIGNED,\n
   `owner` varchar(32) NOT NULL default \'\',\n
+  `viewable_owner` varchar(32) NOT NULL default \'\',\n
   `path` varchar(255) NOT NULL default \'\',\n
   `relative_url` varchar(255) NOT NULL default \'\',\n
   `parent_uid` BIGINT UNSIGNED default \'0\',\n
@@ -128,6 +129,7 @@ CREATE TABLE `catalog` (\n
   PRIMARY KEY  (`uid`),\n
   KEY `security_uid` (`security_uid`),\n
   KEY `owner` (`owner`),\n
+  KEY `viewable_owner` (`viewable_owner`),\n
   KEY `Parent` (`parent_uid`),\n
   KEY `Path` (`path`),\n
   KEY `Title` (`title`),\n
@@ -186,6 +188,7 @@ CREATE TABLE `catalog` (\n
   `uid` BIGINT UNSIGNED NOT NULL,\n
   `security_uid` INT UNSIGNED,\n
   `owner` varchar(32) NOT NULL default \'\',\n
+  `viewable_owner` varchar(32) NOT NULL default \'\',\n
   `path` varchar(255) NOT NULL default \'\',\n
   `relative_url` varchar(255) NOT NULL default \'\',\n
   `parent_uid` BIGINT UNSIGNED default \'0\',\n
@@ -218,6 +221,7 @@ CREATE TABLE `catalog` (\n
   PRIMARY KEY  (`uid`),\n
   KEY `security_uid` (`security_uid`),\n
   KEY `owner` (`owner`),\n
+  KEY `viewable_owner` (`viewable_owner`),\n
   KEY `Parent` (`parent_uid`),\n
   KEY `Path` (`path`),\n
   KEY `Title` (`title`),\n

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRoleKeyTemplateItem/role_key_list.xml

+<key_list>
+ <key>Owner | viewable_owner</key>
+</key_list>
\ No newline at end of file

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision

-90
\ No newline at end of file
+93
\ No newline at end of file

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_role_key_list

+Owner | viewable_owner
\ No newline at end of file