From e12a609a973ffb93dfdfdc61ab8e30976e71a041 Mon Sep 17 00:00:00 2001 From: Nicolas Dumazet <nicolas.dumazet@nexedi.com> Date: Thu, 4 Mar 2010 02:40:13 +0000 Subject: [PATCH] fix bug from r33320 We "uniqify" resource_uid,quantity_unit and not uid,resource_uid. Thanks to dict keys, that should be now clearer than tuple[1],tuple[2] git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33347 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../z_catalog_quantity_unit_conversion_list.xml | 4 ++-- product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.xml b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.xml index c38928f499..c0f8540735 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.xml +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.xml @@ -78,7 +78,7 @@ getQuantityUnitConversionDefinitionRowList\r\n Make sure that we get no duplicates, and also aggregate the uids of the modified resources for deletion\n </dtml-comment>\n <dtml-in loop_item prefix="inner">\n - <dtml-call expr="quantity_unit_conversion_dict.setdefault(inner_item[\'uid\'], {}).setdefault(inner_item[\'resource_uid\'], inner_item)">\n + <dtml-call expr="quantity_unit_conversion_dict.setdefault(inner_item[\'resource_uid\'], {}).setdefault(inner_item[\'quantity_unit\'], inner_item)">\n </dtml-in>\n </dtml-if>\n </dtml-in>\n @@ -155,7 +155,7 @@ VALUES\n Make sure that we get no duplicates, and also aggregate the uids of the modified resources for deletion\n </dtml-comment>\n <dtml-in loop_item prefix="inner">\n - <dtml-call expr="quantity_unit_conversion_dict.setdefault(inner_item[\'uid\'], {}).setdefault(inner_item[\'resource_uid\'], inner_item)">\n + <dtml-call expr="quantity_unit_conversion_dict.setdefault(inner_item[\'resource_uid\'], {}).setdefault(inner_item[\'quantity_unit\'], inner_item)">\n </dtml-in>\n </dtml-if>\n </dtml-in>\n diff --git a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision index a5b5e0f805..cd004727f2 100644 --- a/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision +++ b/product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision @@ -1 +1 @@ -181 \ No newline at end of file +182 \ No newline at end of file -- 2.30.9