[Erp5-report] r17690 - in /erp5/trunk/bt5/erp5_worklist_sql: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Nov 19 18:30:43 CET 2007
Author: vincent
Date: Mon Nov 19 18:30:43 2007
New Revision: 17690
URL: http://svn.erp5.org?rev=17690&view=rev
Log:
Fix naming convention.
Added:
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zCreateWorklistTable.xml
- copied unchanged from r17689, erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zCreateWorklistTable.xml
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zGetCountFromWorklistTable.xml
- copied unchanged from r17689, erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zGetCountFromWorklistTable.xml
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_zInsertIntoWorklistTable.xml
- copied unchanged from r17689, erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zInsertIntoWorklistTable.xml
Removed:
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zCreateWorklistTable.xml
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zGetCountFromWorklistTable.xml
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zInsertIntoWorklistTable.xml
Modified:
erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml
erp5/trunk/bt5/erp5_worklist_sql/bt/revision
Modified: erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml?rev=17690&r1=17689&r2=17690&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml (original)
+++ erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/Base_getCountFromWorklistTable.xml Mon Nov 19 18:30:43 2007
@@ -66,10 +66,10 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from ZODB.POSException import ConflictError\n
-# Wrapper for zGetCountFromWorklistTable\n
+# Wrapper for Base_zGetCountFromWorklistTable\n
where_expression = query.asSQLExpression()[\'where_expression\']\n
try:\n
- result = context.zGetCountFromWorklistTable(\n
+ result = context.Base_zGetCountFromWorklistTable(\n
where_expression=where_expression,\n
select_expression=select_expression,\n
group_by_expression=group_by_expression,\n
@@ -80,7 +80,7 @@
# Possibly a SQL error caused by a non-existing table.\n
# Attemp a refresh and retry without error handling.\n
context.Base_refreshWorklistTableContent()\n
- result = context.zGetCountFromWorklistTable(\n
+ result = context.Base_zGetCountFromWorklistTable(\n
where_expression=where_expression,\n
select_expression=select_expression,\n
group_by_expression=group_by_expression,\n
Removed: erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zCreateWorklistTable.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zCreateWorklistTable.xml?rev=17689&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zCreateWorklistTable.xml (original)
+++ erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zCreateWorklistTable.xml (removed)
@@ -1,149 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="SQL" module="Products.ZSQLMethods.SQL"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_col</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>arguments_src</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>connection_id</string> </key>
- <value> <string>erp5_sql_connection</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>zCreateWorklistTable</string> </value>
- </item>
- <item>
- <key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-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,\n
- `security_uid` INT UNSIGNED NOT NULL,\n
- `portal_type` VARCHAR(255) NOT NULL,\n
- `validation_state` VARCHAR(255) NULL,\n
- `simulation_state` VARCHAR(255) NULL,\n
- KEY `portal_simulation_security` (`portal_type`, `simulation_state`, `security_uid`),\n
- KEY `portal_simulation_owner` (`portal_type`, `simulation_state`, `owner`),\n
- KEY `portal_validation_security` (`portal_type`, `validation_state`, `security_uid`),\n
- KEY `portal_validation_owner` (`portal_type`, `validation_state`, `owner`)\n
-) TYPE=InnoDB;
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-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,\n
- `security_uid` INT UNSIGNED NOT NULL,\n
- `portal_type` VARCHAR(255) NOT NULL,\n
- `validation_state` VARCHAR(255) NULL,\n
- `simulation_state` VARCHAR(255) NULL,\n
- KEY `portal_simulation_security` (`portal_type`, `simulation_state`, `security_uid`),\n
- KEY `portal_simulation_owner` (`portal_type`, `simulation_state`, `owner`),\n
- KEY `portal_validation_security` (`portal_type`, `validation_state`, `security_uid`),\n
- KEY `portal_validation_owner` (`portal_type`, `validation_state`, `owner`)\n
-) TYPE=InnoDB;
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zGetCountFromWorklistTable.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zGetCountFromWorklistTable.xml?rev=17689&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zGetCountFromWorklistTable.xml (original)
+++ erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zGetCountFromWorklistTable.xml (removed)
@@ -1,176 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="SQL" module="Products.ZSQLMethods.SQL"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_Use_Database_Methods_Permission</string> </key>
- <value>
- <tuple>
- <string>Anonymous</string>
- <string>Assignee</string>
- <string>Assignor</string>
- <string>Associate</string>
- <string>Auditor</string>
- <string>Authenticated</string>
- <string>Author</string>
- <string>Manager</string>
- <string>Member</string>
- <string>Owner</string>
- <string>Reviewer</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>group_by_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>select_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>where_expression</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>_keys</string> </key>
- <value>
- <list>
-<string>select_expression</string>
-<string>where_expression</string>
-<string>group_by_expression</string>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>arguments_src</string> </key>
- <value> <string>select_expression\r\n
-where_expression\r\n
-group_by_expression</string> </value>
- </item>
- <item>
- <key> <string>connection_id</string> </key>
- <value> <string>erp5_sql_connection</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>zGetCountFromWorklistTable</string> </value>
- </item>
- <item>
- <key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- <dtml-var select_expression>\n
-FROM\n
- worklist_cache\n
-WHERE\n
- <dtml-var where_expression>\n
-GROUP BY\n
- <dtml-var group_by_expression>\n
-
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-SELECT\n
- <dtml-var select_expression>\n
-FROM\n
- worklist_cache\n
-WHERE\n
- <dtml-var where_expression>\n
-GROUP BY\n
- <dtml-var group_by_expression>\n
-
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zInsertIntoWorklistTable.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zInsertIntoWorklistTable.xml?rev=17689&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zInsertIntoWorklistTable.xml (original)
+++ erp5/trunk/bt5/erp5_worklist_sql/SkinTemplateItem/portal_skins/erp5_worklist_sql/zInsertIntoWorklistTable.xml (removed)
@@ -1,194 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="SQL" module="Products.ZSQLMethods.SQL"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_arg</string> </key>
- <value>
- <object>
- <klass>
- <global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_data</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>count</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>owner</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>security_uid</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>simulation_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>validation_state</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <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>
- </list>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>arguments_src</string> </key>
- <value> <string>count\r\n
-security_uid\r\n
-portal_type\r\n
-simulation_state\r\n
-validation_state\r\n
-owner</string> </value>
- </item>
- <item>
- <key> <string>connection_id</string> </key>
- <value> <string>erp5_sql_connection</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>zInsertIntoWorklistTable</string> </value>
- </item>
- <item>
- <key> <string>src</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- worklist_cache\n
- (`count`, `owner`, `security_uid`, `portal_type`, `validation_state`, `simulation_state`)\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(count))">\n
- (\n
- <dtml-sqlvar expr="count[loop_item]" type="int">,\n
- <dtml-sqlvar expr="owner[loop_item]" type="string">,\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
- <dtml-sqlvar expr="simulation_state[loop_item]" type="string" optional>\n
- )\n
- <dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>template</string> </key>
- <value>
- <object>
- <klass>
- <global name="__newobj__" module="copy_reg"/>
- </klass>
- <tuple>
- <global name="SQL" module="Shared.DC.ZRDB.DA"/>
- </tuple>
- <state>
- <dictionary>
- <item>
- <key> <string>__name__</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-<string>
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_vars</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>globals</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-INSERT INTO\n
- worklist_cache\n
- (`count`, `owner`, `security_uid`, `portal_type`, `validation_state`, `simulation_state`)\n
-VALUES\n
-<dtml-in prefix="loop" expr="_.range(_.len(count))">\n
- (\n
- <dtml-sqlvar expr="count[loop_item]" type="int">,\n
- <dtml-sqlvar expr="owner[loop_item]" type="string">,\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
- <dtml-sqlvar expr="simulation_state[loop_item]" type="string" optional>\n
- )\n
- <dtml-if sequence-end><dtml-else>,</dtml-if>\n
-</dtml-in>
-
-]]></string> </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_worklist_sql/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_worklist_sql/bt/revision?rev=17690&r1=17689&r2=17690&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_worklist_sql/bt/revision (original)
+++ erp5/trunk/bt5/erp5_worklist_sql/bt/revision Mon Nov 19 18:30:43 2007
@@ -1,1 +1,1 @@
-5
+6
More information about the Erp5-report
mailing list