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

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Oct 22 18:07:34 2009
New Revision: 29945

URL: http://svn.erp5.org?rev=29945&view=rev
Log:
support deferred style even if we are not redirecting

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=29945&r1=29944&r2=29945&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] Thu Oct 22 18:07:34 2009
@@ -253,6 +253,9 @@
     new_skin_name = clean_kw[\'portal_skin\']\n
     context.getPortalObject().portal_skins.changeSkin(new_skin_name)\n
     request.set(\'portal_skin\', new_skin_name)\n
+    deferred_portal_skin = clean_kw.get(\'deferred_portal_skin\')\n
+    if deferred_portal_skin:\n
+      request.set(\'deferred_portal_skin\', deferred_portal_skin)\n
 \n
   # If we cannot redirect, then call the form directly.\n
   dialog_form = getattr(context, dialog_method)\n
@@ -375,6 +378,7 @@
                             <string>clean_kw</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>

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=29945&r1=29944&r2=29945&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Oct 22 18:07:34 2009
@@ -1,1 +1,1 @@
-1347
+1348