From bfcccb4e46b5d75e20b42c2e53f22d89177e9a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Wed, 16 Dec 2009 17:21:35 +0000
Subject: [PATCH] Also set deferred_style_dialog_method in kw, so that it is
passed to the method in case Base_callDialogMethod does not redirect
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31353 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_skins/erp5_core/Base_callDialogMethod.xml | 2 +-
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml
index b21d52a767..fe5c1fe3e1 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_callDialogMethod.xml
@@ -236,7 +236,6 @@ for k, v in kw.items() :\n
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
@@ -249,6 +248,7 @@ if clean_kw.get(\'deferred_style\', 0):\n
if page_template != \'report_view\':\n
# use simple wrapper\n
clean_kw[\'deferred_style_dialog_method\'] = dialog_method\n
+ kw[\'deferred_style_dialog_method\'] = dialog_method\n
request.set(\'deferred_style_dialog_method\', dialog_method)\n
dialog_method = \'Base_activateSimpleView\'\n
\n
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index ca12c174d8..347c6fecb0 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1404
\ No newline at end of file
+1405
\ No newline at end of file
--
2.30.9