From b13c010807cd03ace342463366e5787fa47fdc14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 19 Dec 2007 18:55:18 +0000 Subject: [PATCH] `format` field for dialog should honor forced skin name. Note that we use: request.get('your_portal_skin', request.get('field_your_portal_skin', ...) * your_portal_skin is for the * field_your_portal_skin is for Base_callDialogMethod, which iterates on form.get_fields, which will not return the field unless it's enabled. Maybe Base_callDialogMethod should use form.get_fields(include_disabled=1) ? git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18441 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_core/Base_viewDialogFieldLibrary/your_format.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_viewDialogFieldLibrary/your_format.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_format.xml index 5dfd1ade21..c230fbde38 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_format.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDialogFieldLibrary/your_format.xml @@ -295,7 +295,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: preferences.getPreference(\'preferred_report_style\', \'Print\') in (\'ODS\', \'ODT\')</string> </value> + <value> <string>python: request.get(\'your_portal_skin\', request.get(\'field_your_portal_skin\', preferences.getPreference(\'preferred_report_style\', \'Print\'))) in (\'ODS\', \'ODT\')</string> </value> </item> </dictionary> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 876cce90b1..7703a12954 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -654 \ No newline at end of file +656 \ No newline at end of file -- 2.30.9