From 0ac7e587e6c0ba9526c997cc9c67fe558953255e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 10 Nov 2015 12:59:55 +0100 Subject: [PATCH] Manage view_ids on tree view issue5052 review15771003 --- CHANGELOG | 1 + tryton/gui/window/view_form/view/list_gtk/widget.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fc9b14e87b..c14396d97e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Manage view_ids on tree view * Use Apple key for copy/past of list Version 3.8.0 - 2015-11-02 diff --git a/tryton/gui/window/view_form/view/list_gtk/widget.py b/tryton/gui/window/view_form/view/list_gtk/widget.py index f6ffd9f7bb..11629f3153 100644 --- a/tryton/gui/window/view_form/view/list_gtk/widget.py +++ b/tryton/gui/window/view_form/view/list_gtk/widget.py @@ -587,7 +587,8 @@ class M2O(GenericText): context=context, callback=callback).show() return screen = Screen(relation, domain=domain, context=context, - mode=['form'], exclude_field=field.attrs.get('relation_field')) + mode=['form'], view_ids=self.attrs.get('view_ids', '').split(','), + exclude_field=field.attrs.get('relation_field')) def open_callback(result): if result: @@ -617,7 +618,9 @@ class M2O(GenericText): if callback: callback() win = WinSearch(relation, search_callback, sel_multi=False, - context=context, domain=domain, new=create_access) + context=context, domain=domain, + view_ids=self.attrs.get('view_ids', '').split(','), + new=create_access) win.screen.search_filter(quote(text.decode('utf-8'))) return win @@ -711,6 +714,7 @@ class O2M(GenericText): return screen = Screen(relation, mode=['tree', 'form'], + view_ids=self.attrs.get('view_ids', '').split(','), exclude_field=field.attrs.get('relation_field')) screen.pre_validate = bool(int(self.attrs.get('pre_validate', 0))) screen.group = group @@ -732,6 +736,7 @@ class M2M(O2M): domain = field.domain_get(record) screen = Screen(relation, mode=['tree', 'form'], + view_ids=self.attrs.get('view_ids', '').split(','), exclude_field=field.attrs.get('relation_field')) screen.group = group