[Erp5-report] r22730 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Jul 29 18:38:08 CEST 2008


Author: jerome
Date: Tue Jul 29 18:38:08 2008
New Revision: 22730

URL: http://svn.erp5.org?rev=22730&view=rev
Log:
Base_initIntIndexAndReference and DeliveryCell_init, DeliveryLine_init, OrderLine_init looks identical. Stop code duplication

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml?rev=22730&r1=22729&r2=22730&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_init.xml Tue Jul 29 18:38:08 2008
@@ -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>
@@ -84,6 +76,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>
@@ -118,14 +116,9 @@
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
+                            <string>_apply_</string>
+                            <string>_getattr_</string>
                             <string>context</string>
-                            <string>line</string>
-                            <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>reference</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml?rev=22730&r1=22729&r2=22730&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryLine_init.xml Tue Jul 29 18:38:08 2008
@@ -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>
@@ -84,6 +76,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>
@@ -118,15 +116,9 @@
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
+                            <string>_apply_</string>
+                            <string>_getattr_</string>
                             <string>context</string>
-                            <string>line</string>
-                            <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>str</string>
-                            <string>reference</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml?rev=22730&r1=22729&r2=22730&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml Tue Jul 29 18:38:08 2008
@@ -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>
@@ -88,6 +76,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>
@@ -122,15 +116,9 @@
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
+                            <string>_apply_</string>
+                            <string>_getattr_</string>
                             <string>context</string>
-                            <string>line</string>
-                            <string>_getattr_</string>
-                            <string>parent</string>
-                            <string>line_pt</string>
-                            <string>len</string>
-                            <string>index</string>
-                            <string>reference</string>
-                            <string>str</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=22730&r1=22729&r2=22730&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Tue Jul 29 18:38:08 2008
@@ -1,1 +1,1 @@
-449
+451




More information about the Erp5-report mailing list