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

[nobody at svn.erp5.org]

Author: romain
Date: Wed Mar 19 15:16:52 2008
New Revision: 20042

URL: http://svn.erp5.org?rev=20042&view=rev
Log:
Add a first prototype of Field Editor handling in dialog.
This is only compatible with FormBox for now.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml?rev=20042&r1=20041&r2=20042&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml Wed Mar 19 15:16:52 2008
@@ -148,6 +148,7 @@
 \n
 \n
 form = getattr(context, dialog_id)\n
+\n
 # form can be a python script that returns the form\n
 if not hasattr(form, \'validate_all_to_request\'):\n
   form = form()\n
@@ -183,10 +184,18 @@
       listbox_id_list.append(k)\n
     elif can_redirect and (v in (None, [], ()) or hasattr(v, \'read\')) : # If we cannot redirect, useless to test it again\n
       can_redirect = 0\n
+\n
     # Cleanup my_ and your_ prefixes\n
     splitted = k.split(\'_\', 1)\n
     if len(splitted) == 2 and splitted[0] in (\'my\', \'your\'):\n
-      kw[splitted[1]] = request_form[splitted[1]] = v\n
+\n
+      if hasattr(v, \'as_dict\'):\n
+        # This is an encapsulated editor\n
+        # convert it\n
+        kw.update(v.as_dict())\n
+      else:\n
+        kw[splitted[1]] = request_form[splitted[1]] = v\n
+\n
     else:\n
       kw[k] = request_form[k] = v\n
 \n
@@ -270,6 +279,7 @@
                               , dialog_method\n
                               , url_params_string\n
                               )\n
+\n
 else:\n
   redirect_url = \'%s/%s\' % ( context.absolute_url()\n
                             , dialog_method\n

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=20042&r1=20041&r2=20042&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Wed Mar 19 15:16:52 2008
@@ -1,1 +1,1 @@
-755
+757