[Erp5-report] r19412 - in /erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog: Ca...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 19 18:06:28 CET 2008
Author: romain
Date: Tue Feb 19 18:06:28 2008
New Revision: 19412
URL: http://svn.erp5.org?rev=19412&view=rev
Log:
Rename owner column to viewable_owner.
Add owner column which always contain the owner id of the object.
Added:
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRoleKeyTemplateItem/
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRoleKeyTemplateItem/role_key_list.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_local_role_key_list
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_role_key_list
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/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.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=19412&r1=19411&r2=19412&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 Tue Feb 19 18:06:28 2008
@@ -114,6 +114,12 @@
</value>
</item>
<item>
+ <key> <string>getOwnerInfo</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
<key> <string>getParentUid</string> </key>
<value>
<dictionary/>
@@ -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 @@
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 @@
(\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 @@
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 @@
(\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
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml?rev=19412&r1=19411&r2=19412&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_catalog.xml Tue Feb 19 18:06:28 2008
@@ -96,6 +96,7 @@
`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 @@
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 @@
`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 @@
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
Added: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRoleKeyTemplateItem/role_key_list.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRoleKeyTemplateItem/role_key_list.xml?rev=19412&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRoleKeyTemplateItem/role_key_list.xml (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogRoleKeyTemplateItem/role_key_list.xml Tue Feb 19 18:06:28 2008
@@ -1,0 +1,3 @@
+<key_list>
+ <key>Owner | viewable_owner</key>
+</key_list>
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=19412&r1=19411&r2=19412&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 Tue Feb 19 18:06:28 2008
@@ -1,1 +1,1 @@
-90
+93
Added: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_local_role_key_list
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_local_role_key_list?rev=19412&view=auto
==============================================================================
(empty)
Added: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_role_key_list
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_role_key_list?rev=19412&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_role_key_list (added)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_role_key_list Tue Feb 19 18:06:28 2008
@@ -1,0 +1,1 @@
+Owner | viewable_owner
More information about the Erp5-report
mailing list