From 076a33212dec7e9d615676833d76bafde1221713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 29 Jul 2008 16:38:08 +0000
Subject: [PATCH] Base_initIntIndexAndReference and DeliveryCell_init,
 DeliveryLine_init, OrderLine_init looks identical. Stop code duplication

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22730 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_trade/DeliveryCell_init.xml          | 25 ++++++----------
 .../erp5_trade/DeliveryLine_init.xml          | 26 ++++++----------
 .../erp5_trade/OrderLine_init.xml             | 30 ++++++-------------
 bt5/erp5_trade/bt/revision                    |  2 +-
 4 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml
index 9eee5d9337..9afdff7109 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml
@@ -65,15 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>line = context\n
-parent = context.getParentValue()\n
-\n
-line_pt = line.getPortalType()\n
-\n
-index = len(parent.contentValues(filter={"portal_type": line_pt}))\n
-reference = "%s.%s" % (parent.getReference(), index)\n
-\n
-line.edit(reference=reference, int_index=index)\n
+            <value> <string>context.Base_initIntIndexAndReference(*args, **kw)\n
 </string> </value>
         </item>
         <item>
@@ -88,6 +80,12 @@ line.edit(reference=reference, int_index=index)\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>*args, **kw</string> </value>
@@ -118,14 +116,9 @@ line.edit(reference=reference, int_index=index)\n
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
-                            <string>context</string>
-                            <string>line</string>
+                            <string>_apply_</string>
                             <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>reference</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml
index 5e59fa493e..35134aa1b4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml
@@ -65,15 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>line = context\n
-parent = context.getParentValue()\n
-\n
-line_pt = line.getPortalType()\n
-\n
-index = len(parent.contentValues(filter={"portal_type": line_pt}))\n
-reference = str(index)\n
-\n
-line.edit(reference=reference, int_index=index)\n
+            <value> <string>context.Base_initIntIndexAndReference(*args, **kw)\n
 </string> </value>
         </item>
         <item>
@@ -88,6 +80,12 @@ line.edit(reference=reference, int_index=index)\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>*args, **kw</string> </value>
@@ -118,15 +116,9 @@ line.edit(reference=reference, int_index=index)\n
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
-                            <string>context</string>
-                            <string>line</string>
+                            <string>_apply_</string>
                             <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>str</string>
-                            <string>reference</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
index eba292c6a7..b691068052 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
@@ -65,19 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>line = context\n
-parent = context.getParentValue()\n
-\n
-line_pt = line.getPortalType()\n
-\n
-index = len(parent.contentValues(filter={"portal_type": line_pt}))\n
-\n
-if parent.getPortalType() == line_pt:\n
-  reference = "%s.%s" % (parent.getReference(), index)\n
-else:\n
-  reference = str(index)\n
-\n
-line.edit(reference=reference, int_index=index)\n
+            <value> <string>context.Base_initIntIndexAndReference(*args, **kw)\n
 </string> </value>
         </item>
         <item>
@@ -92,6 +80,12 @@ line.edit(reference=reference, int_index=index)\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>*args, **kw</string> </value>
@@ -122,15 +116,9 @@ line.edit(reference=reference, int_index=index)\n
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
-                            <string>context</string>
-                            <string>line</string>
+                            <string>_apply_</string>
                             <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>reference</string>
-                            <string>str</string>
+                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 1f704ce60d..4991210660 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-449
\ No newline at end of file
+451
\ No newline at end of file
-- 
2.30.9