[Erp5-report] r31183 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplat...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Dec  9 13:16:48 2009
New Revision: 31183

URL: http://svn.erp5.org?rev=31183&view=rev
Log:
Allow rendering of any form / printout in deferred mode

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=31183&r1=31182&r2=31183&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml [utf8] Wed Dec  9 13:16:48 2009
@@ -236,11 +236,21 @@
   if v not in (None, [], ()) :\n
     clean_kw[k] = kw[k]\n
 \n
+\n
 # Handle deferred style\n
 if clean_kw.get(\'deferred_style\', 0):\n
   clean_kw[\'deferred_portal_skin\'] = clean_kw.get(\'portal_skin\', None)\n
   # XXX Hardcoded Deferred style name\n
   clean_kw[\'portal_skin\'] = \'Deferred\'\n
+  \n
+  dialog_form = getattr(context, dialog_method)\n
+  page_template = getattr(dialog_form, \'pt\', None)\n
+  # If the action form has report_view as it\'s method, it \n
+  if page_template != \'report_view\':\n
+    # use simple wrapper\n
+    clean_kw[\'deferred_style_dialog_method\'] = dialog_method\n
+    request.set(\'deferred_style_dialog_method\', dialog_method)\n
+    dialog_method = \'Base_activateSimpleView\'\n
 \n
 url_params_string = make_query(clean_kw)\n
 \n
@@ -376,10 +386,11 @@
                             <string>uids</string>
                             <string>selected_uids</string>
                             <string>clean_kw</string>
+                            <string>dialog_form</string>
+                            <string>page_template</string>
                             <string>url_params_string</string>
                             <string>new_skin_name</string>
                             <string>deferred_portal_skin</string>
-                            <string>dialog_form</string>
                             <string>_apply_</string>
                             <string>redirect_url</string>
                           </tuple>

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=31183&r1=31182&r2=31183&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Dec  9 13:16:48 2009
@@ -1,1 +1,1 @@
-1395
+1396