From 48b46632056a5b288c09c58d21fd1be3ca9032f8 Mon Sep 17 00:00:00 2001 From: C?dric Krier Date: Wed, 29 Mar 2017 22:38:20 +0200 Subject: [PATCH] Manage context domain on screen issue5485 review27151002 --- src/action.js | 1 + src/screen.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/action.js b/src/action.js index 1cab3bf..6eb1433 100644 --- a/src/action.js +++ b/src/action.js @@ -96,6 +96,7 @@ params.model = action.res_model || data.res_model; params.res_id = action.res_id || data.res_id; params.context_model = action.context_model; + params.context_domain = action.context_domain; params.limit = action.limit; params.icon = action['icon.rec_name'] || ''; diff --git a/src/screen.js b/src/screen.js index f93e93c..6f25ad8 100644 --- a/src/screen.js +++ b/src/screen.js @@ -633,6 +633,7 @@ this.current_view = null; this.current_record = null; this.domain = attributes.domain || []; + this.context_domain = attributes.context_domain; this.size_limit = null; if (this.attributes.limit === undefined) { this.limit = Sao.config.limit; @@ -812,6 +813,10 @@ } var domain = this.search_domain(search_string, true); + if (this.context_domain) { + var decoder = new Sao.PYSON.Decoder(this.context); + domain = ['AND', domain, decoder.decode(this.context_domain)]; + } var tab_domain = this.screen_container.get_tab_domain(); if (!jQuery.isEmptyObject(tab_domain)) { domain = ['AND', domain, tab_domain];