From 7385e47aac75277643be1f15c48fb21034186db4 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Fri, 16 Dec 2011 16:49:04 +0100 Subject: [PATCH] Remove duplicated zsql method. --- ...voiceTransaction_selectInvoiceMovement.xml | 2 +- ...ifibInvoiceTransaction_zSelectMovement.xml | 109 ------------------ master/bt5/vifib_data_simulation/bt/revision | 2 +- 3 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 master/bt5/vifib_data_simulation/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_zSelectMovement.xml diff --git a/master/bt5/vifib_data_simulation/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_selectInvoiceMovement.xml b/master/bt5/vifib_data_simulation/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_selectInvoiceMovement.xml index ab99ff3fa..63a1f22c9 100644 --- a/master/bt5/vifib_data_simulation/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_selectInvoiceMovement.xml +++ b/master/bt5/vifib_data_simulation/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_selectInvoiceMovement.xml @@ -66,7 +66,7 @@ kw[\'grand_parent_simulation_state\'] = [\'confirmed\']\n search_kw = kw.copy()\n search_kw.update(context.portal_catalog.buildSQLQuery(**search_kw))\n \n -normal_movement_list = [movement for movement in context.VifibInvoiceTransaction_zSelectMovement(**search_kw)]\n +normal_movement_list = [movement for movement in context.InvoiceTransaction_zSelectMovement(**search_kw)]\n \n # update query to search for movements which are children of Trade Model Rule\n kw.pop(\'grand_parent_simulation_state\')\n diff --git a/master/bt5/vifib_data_simulation/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_zSelectMovement.xml b/master/bt5/vifib_data_simulation/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_zSelectMovement.xml deleted file mode 100644 index 834711d11..000000000 --- a/master/bt5/vifib_data_simulation/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_zSelectMovement.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="SQL" module="Products.ZSQLMethods.SQL"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_Use_Database_Methods_Permission</string> </key> - <value> - <list> - <string>Member</string> - </list> - </value> - </item> - <item> - <key> <string>allow_simple_one_argument_traversal</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>arguments_src</string> </key> - <value> <string>from_table_list:list\r\n -where_expression\r\n -order_by_expression</string> </value> - </item> - <item> - <key> <string>cache_time_</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>class_file_</string> </key> - <value> <string>ZSQLCatalog.zsqlbrain</string> </value> - </item> - <item> - <key> <string>class_name_</string> </key> - <value> <string>ZSQLBrain</string> </value> - </item> - <item> - <key> <string>connection_hook</string> </key> - <value> - <none/> - </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>VifibInvoiceTransaction_zSelectMovement</string> </value> - </item> - <item> - <key> <string>max_cache_</string> </key> - <value> <int>100</int> </value> - </item> - <item> - <key> <string>max_rows_</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>src</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -SELECT\n - catalog.uid,\n - catalog.path,\n - catalog.relative_url,\n - catalog.id\n -\n -FROM\n - movement\n -<dtml-in prefix="table" expr="from_table_list"> \n - <dtml-if expr="table_key not in (\'catalog\', \'movement\')">\n - , <dtml-var table_item> AS <dtml-var table_key>\n - </dtml-if>\n -</dtml-in>\n - , catalog\n - LEFT JOIN category \n - ON (catalog.uid = category.uid\n - AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n -WHERE\n - 1=1\n - <dtml-if where_expression>\n - AND <dtml-var where_expression> \n - </dtml-if>\n - \n - AND movement.uid = catalog.uid\n - AND movement.resource_uid is not NULL\n - AND category.category_uid is NULL\n -\n -<dtml-if order_by_expression>\n -ORDER BY <dtml-var order_by_expression>\n -</dtml-if>\n -\n - - -]]></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/master/bt5/vifib_data_simulation/bt/revision b/master/bt5/vifib_data_simulation/bt/revision index c5b431b6c..7003e7fe1 100644 --- a/master/bt5/vifib_data_simulation/bt/revision +++ b/master/bt5/vifib_data_simulation/bt/revision @@ -1 +1 @@ -50 \ No newline at end of file +51 \ No newline at end of file -- 2.30.9