diff --git a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml index a07e0a4758d41580f1cce33261136fdc6ac55e7c..a33b4782ecaae95192d276075da5d0cd48afbda8 100644 --- a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml +++ b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml @@ -68,7 +68,8 @@ DROP TABLE IF EXISTS worklist_cache\n <dtml-var sql_delimiter>\n CREATE TABLE `worklist_cache` (\n `count` INT UNSIGNED NOT NULL,\n - `owner` VARCHAR(32) NOT NULL DEFAULT \'\',\n + `owner` VARCHAR(32) DEFAULT \'\',\n + `viewable_owner` VARCHAR(32) NOT NULL DEFAULT \'\',\n `security_uid` INT UNSIGNED NOT NULL,\n `portal_type` VARCHAR(255) NOT NULL,\n `validation_state` VARCHAR(255) NULL,\n @@ -92,9 +93,9 @@ CREATE TABLE `worklist_cache` (\n `creation_date` datetime,\n `modification_date` datetime,\n KEY `portal_simulation_security` (`portal_type`, `simulation_state`, `security_uid`),\n - KEY `portal_simulation_owner` (`portal_type`, `simulation_state`, `owner`),\n + KEY `portal_simulation_owner` (`portal_type`, `simulation_state`, `viewable_owner`),\n KEY `portal_validation_security` (`portal_type`, `validation_state`, `security_uid`),\n - KEY `portal_validation_owner` (`portal_type`, `validation_state`, `owner`)\n + KEY `portal_validation_owner` (`portal_type`, `validation_state`, `viewable_owner`)\n ) TYPE=InnoDB; ]]></string> </value> @@ -139,7 +140,8 @@ DROP TABLE IF EXISTS worklist_cache\n <dtml-var sql_delimiter>\n CREATE TABLE `worklist_cache` (\n `count` INT UNSIGNED NOT NULL,\n - `owner` VARCHAR(32) NOT NULL DEFAULT \'\',\n + `owner` VARCHAR(32) DEFAULT \'\',\n + `viewable_owner` VARCHAR(32) NOT NULL DEFAULT \'\',\n `security_uid` INT UNSIGNED NOT NULL,\n `portal_type` VARCHAR(255) NOT NULL,\n `validation_state` VARCHAR(255) NULL,\n @@ -163,9 +165,9 @@ CREATE TABLE `worklist_cache` (\n `creation_date` datetime,\n `modification_date` datetime,\n KEY `portal_simulation_security` (`portal_type`, `simulation_state`, `security_uid`),\n - KEY `portal_simulation_owner` (`portal_type`, `simulation_state`, `owner`),\n + KEY `portal_simulation_owner` (`portal_type`, `simulation_state`, `viewable_owner`),\n KEY `portal_validation_security` (`portal_type`, `validation_state`, `security_uid`),\n - KEY `portal_validation_owner` (`portal_type`, `validation_state`, `owner`)\n + KEY `portal_validation_owner` (`portal_type`, `validation_state`, `viewable_owner`)\n ) TYPE=InnoDB; ]]></string> </value> diff --git a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml index 0f97ddccd1129f23f91f367dba2e689a5159a02d..41da1b708931b5d2639f4d98dc7919fa59840896 100644 --- a/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml +++ b/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml @@ -173,6 +173,12 @@ <dictionary/> </value> </item> + <item> + <key> <string>viewable_owner</string> </key> + <value> + <dictionary/> + </value> + </item> </dictionary> </value> </item> @@ -180,30 +186,31 @@ <key> <string>_keys</string> </key> <value> <list> - <string>count</string> - <string>security_uid</string> - <string>portal_type</string> - <string>simulation_state</string> - <string>validation_state</string> - <string>owner</string> - <string>parent_uid</string> - <string>title</string> - <string>opportunity_state</string> - <string>causality_state</string> - <string>invoice_state</string> - <string>payment_state</string> - <string>event_state</string> - <string>immobilisation_state</string> - <string>reference</string> - <string>grouping_reference</string> - <string>source_reference</string> - <string>destination_reference</string> - <string>string_index</string> - <string>int_index</string> - <string>float_index</string> - <string>has_cell_content</string> - <string>creation_date</string> - <string>modification_date</string> +<string>count</string> +<string>security_uid</string> +<string>portal_type</string> +<string>simulation_state</string> +<string>validation_state</string> +<string>owner</string> +<string>viewable_owner</string> +<string>parent_uid</string> +<string>title</string> +<string>opportunity_state</string> +<string>causality_state</string> +<string>invoice_state</string> +<string>payment_state</string> +<string>event_state</string> +<string>immobilisation_state</string> +<string>reference</string> +<string>grouping_reference</string> +<string>source_reference</string> +<string>destination_reference</string> +<string>string_index</string> +<string>int_index</string> +<string>float_index</string> +<string>has_cell_content</string> +<string>creation_date</string> +<string>modification_date</string> </list> </value> </item> @@ -220,6 +227,7 @@ portal_type\r\n simulation_state\r\n validation_state\r\n owner\r\n +viewable_owner\r\n parent_uid\r\n title\r\n opportunity_state\r\n @@ -253,7 +261,7 @@ modification_date</string> </value> INSERT INTO\n worklist_cache\n - (`count`, `owner`, `security_uid`, `portal_type`, `validation_state`, `simulation_state`, `parent_uid`, `title`,`opportunity_state`, `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`,\n + (`count`, `owner`, `viewable_owner`, `security_uid`, `portal_type`, `validation_state`, `simulation_state`, `parent_uid`, `title`,`opportunity_state`, `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 `modification_date`)\n VALUES\n @@ -261,6 +269,7 @@ VALUES\n (\n <dtml-sqlvar expr="count[loop_item]" type="int">,\n <dtml-sqlvar expr="owner[loop_item]" type="string" optional>,\n + <dtml-sqlvar expr="viewable_owner[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n <dtml-sqlvar expr="portal_type[loop_item]" type="string">,\n <dtml-sqlvar expr="validation_state[loop_item]" type="string" optional>,\n @@ -327,7 +336,7 @@ VALUES\n INSERT INTO\n worklist_cache\n - (`count`, `owner`, `security_uid`, `portal_type`, `validation_state`, `simulation_state`, `parent_uid`, `title`,`opportunity_state`, `causality_state`, `invoice_state`, `payment_state`, `event_state`, `immobilisation_state`, `reference`, `grouping_reference`,\n + (`count`, `owner`, `viewable_owner`, `security_uid`, `portal_type`, `validation_state`, `simulation_state`, `parent_uid`, `title`,`opportunity_state`, `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 `modification_date`)\n VALUES\n @@ -335,6 +344,7 @@ VALUES\n (\n <dtml-sqlvar expr="count[loop_item]" type="int">,\n <dtml-sqlvar expr="owner[loop_item]" type="string" optional>,\n + <dtml-sqlvar expr="viewable_owner[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="security_uid[loop_item]" type="int">,\n <dtml-sqlvar expr="portal_type[loop_item]" type="string">,\n <dtml-sqlvar expr="validation_state[loop_item]" type="string" optional>,\n diff --git a/bt5/erp5_worklist_sql/bt/revision b/bt5/erp5_worklist_sql/bt/revision index 9d607966b721abde8931ddd052181fae905db503..8e2afd342773582f9484b796cdc0b84736e8194e 100644 --- a/bt5/erp5_worklist_sql/bt/revision +++ b/bt5/erp5_worklist_sql/bt/revision @@ -1 +1 @@ -11 \ No newline at end of file +17 \ No newline at end of file