From 293a0f7d826109c9f0150701632bc4e269fa066c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 20 Jan 2009 18:13:17 +0000 Subject: [PATCH] when using proxy listbox ID, if the proxy listbox does not set any portal types filter, use portal type filter from the relation field. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25209 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_core/Base_getRelatedObjectParameter.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_getRelatedObjectParameter.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getRelatedObjectParameter.xml index 851b37cbf2..335f1d225e 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getRelatedObjectParameter.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getRelatedObjectParameter.xml @@ -79,7 +79,7 @@ if parameter is not None:\n return portal_type\n \n proxied_listbox_portal_type = proxied_listbox.get_value(\'portal_types\')\n - return [x for x in proxied_listbox_portal_type if x in portal_type]\n + return [x for x in proxied_listbox_portal_type if x in portal_type] or portal_type\n \n return result\n </string> </value> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 2e9bdd99c0..20f199ae39 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -1074 \ No newline at end of file +1075 \ No newline at end of file -- 2.30.9