[Erp5-report] r19608 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: alex
Date: Fri Feb 29 17:16:49 2008
New Revision: 19608

URL: http://svn.erp5.org?rev=19608&view=rev
Log:
Base_edit now passes the form's edit_order to edit()

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml?rev=19608&r1=19607&r2=19608&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml Fri Feb 29 17:16:49 2008
@@ -100,6 +100,7 @@
 \n
 # Get the form\n
 form = getattr(context,form_id)\n
+edit_order = form.edit_order\n
 \n
 try:\n
   # Validate\n
@@ -129,7 +130,7 @@
         gv[k] = getattr(request, k, None)\n
     for url, v in listbox.items():\n
       v.update(gv)\n
-      context.restrictedTraverse(url).edit(**v)\n
+      context.restrictedTraverse(url).edit(edit_order=edit_order, **v)\n
 \n
 def editMatrixBox(matrixbox_field, matrixbox):\n
   """ Function called to edit a Matrix box\n
@@ -186,7 +187,7 @@
         if matrix_context.hasInRange(*k, **kd):\n
           c = matrix_context.newCell(*k, **kd)\n
           if c is not None:\n
-            c.edit(**gv)  # First update globals which include the def. of property_list\n
+            c.edit(edit_order=edit_order, **gv)  # First update globals which include the def. of property_list\n
             if v.has_key(\'variated_property\'):\n
               # For Variated Properties\n
               value = v[\'variated_property\']\n
@@ -197,7 +198,7 @@
                 # XXX May require some changes with Sets\n
                 key = gv[\'mapped_value_property_list\'][0]\n
                 v[key] = value\n
-            c.edit(**v) # and update the cell specific values\n
+            c.edit(edit_order=edit_order, **v) # and update the cell specific values\n
           else:\n
             return "Could not create cell %s" % str(k)\n
         else:\n
@@ -254,7 +255,7 @@
 \n
   # Maybe we should build a list of objects we need\n
   # Update basic attributes\n
-  context.edit(REQUEST=request, **kw)\n
+  context.edit(REQUEST=request, edit_order=edit_order, **kw)\n
   for encapsulated_editor in encapsulated_editor_list:\n
     encapsulated_editor.edit(context)\n
 except ActivityPendingError,e:\n
@@ -295,6 +296,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>
@@ -349,6 +356,7 @@
                             <string>_getitem_</string>
                             <string>getattr</string>
                             <string>form</string>
+                            <string>edit_order</string>
                             <string>validation_errors</string>
                             <string>field_errors</string>
                             <string>_getiter_</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=19608&r1=19607&r2=19608&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Feb 29 17:16:49 2008
@@ -1,1 +1,1 @@
-716
+717