From c72b8f46d3ebf021d57ed7f0a4b52338ae8d4d4c Mon Sep 17 00:00:00 2001
From: C?dric Krier <ced@b2ck.com>
Date: Tue, 15 Mar 2016 17:46:26 +0100
Subject: [PATCH] Manage context model of ir.action.act_window

issue5220
review15881002
---
 CHANGELOG     |  1 +
 src/action.js |  1 +
 src/common.js |  2 +-
 src/screen.js | 73 ++++++++++++++++++++++++++++++++++++++++++++-------
 4 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4b83100..4b4bc25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Manage context model of ir.action.act_window
 * Add Note
 
 Version 3.8.0 - 2015-11-02
diff --git a/src/action.js b/src/action.js
index 08af546..e94c4ce 100644
--- a/src/action.js
+++ b/src/action.js
@@ -85,6 +85,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.limit = action.limit;
                 params.icon = action['icon.rec_name'] || '';
                 Sao.Tab.create(params);
diff --git a/src/common.js b/src/common.js
index b5d5117..e42018b 100644
--- a/src/common.js
+++ b/src/common.js
@@ -1137,7 +1137,7 @@
                 if ((operator == 'ilike') || (operator == 'not ilike')) {
                     value = this.likify(value);
                 }
-                new_domain = this.append_ending_clause(domain,
+                var new_domain = this.append_ending_clause(domain,
                         [field.name, operator, value], deep);
                 new_domain_string = this.string(new_domain);
                 results.push(pslice(new_domain_string, deep));
diff --git a/src/screen.js b/src/screen.js
index 210fc62..408043d 100644
--- a/src/screen.js
+++ b/src/screen.js
@@ -15,9 +15,15 @@
             this.el = jQuery('<div/>', {
                 'class': 'screen-container'
             });
-            this.filter_box = jQuery('<div/>', {
-                'class': 'row filter-box'
-            });
+            this.filter_box = jQuery('<form/>', {
+                'class': 'filter-box'
+            }).submit(function(e) {
+                this.do_search();
+                e.preventDefault();
+            }.bind(this));
+            var search_row = jQuery('<div/>', {
+                'class': 'row'
+            }).appendTo(this.filter_box);
             this.el.append(this.filter_box);
             this.filter_button = jQuery('<button/>', {
                 type: 'button',
@@ -34,6 +40,14 @@
             this.search_entry.keypress(this.key_press.bind(this));
             this.search_entry.on('input', this.update.bind(this));
 
+            var but_submit = jQuery('<button/>', {
+                'type': 'submit',
+                'class': 'btn btn-default',
+                'aria-label': Sao.i18n.gettext('Search')
+            }).append(jQuery('<span/>', {
+                'class': 'glyphicon glyphicon-search'
+            }));
+
             this.but_bookmark = jQuery('<button/>', {
                 type: 'button',
                 'class': 'btn btn-default dropdown-toggle',
@@ -70,6 +84,7 @@
             }.bind(this));
             this.but_star = jQuery('<button/>', {
                 'class': 'btn btn-default',
+                'type': 'button'
             }).append(jQuery('<span/>', {
                 'class': 'glyphicon',
                 'aria-hidden': true
@@ -86,12 +101,13 @@
             .append(this.search_list)
             .append(jQuery('<span/>', {
                 'class': 'input-group-btn'
-            }).append(this.but_star)
+            }).append(but_submit)
+                    .append(this.but_star)
                     .append(this.but_bookmark)
                     .append(dropdown_bookmark))
             .appendTo(jQuery('<div/>', {
                 'class': 'col-md-8'
-            }).appendTo(this.filter_box));
+            }).appendTo(search_row));
 
 
             this.but_prev = jQuery('<button/>', {
@@ -121,7 +137,7 @@
             .append(this.but_next)
             .appendTo(jQuery('<div/>', {
                 'class': 'col-md-4'
-            }).appendTo(this.filter_box));
+            }).appendTo(search_row));
 
             this.content_box = jQuery('<div/>', {
                 'class': 'content-box'
@@ -274,10 +290,6 @@
             return this.screen.search_filter(this.get_text());
         },
         key_press: function(e) {
-            if (e.which == Sao.common.RETURN_KEYCODE) {
-                this.do_search();
-                return false;
-            }
             // Wait the current event finished
             window.setTimeout(function() {
                 this.bookmark_match();
@@ -594,6 +606,30 @@
             this.search_count = 0;
             this.screen_container = new Sao.ScreenContainer(
                 attributes.tab_domain);
+
+            this.context_screen = null;
+            if (attributes.context_model) {
+                this.context_screen = new Sao.Screen(
+                        attributes.context_model, {
+                            'mode': ['form'],
+                            'context': attributes.context });
+
+                this.context_screen_prm = this.context_screen.switch_view()
+                    .then(function() {
+                        jQuery('<div/>', {
+                            'class': 'row'
+                        }).append(jQuery('<div/>', {
+                            'class': 'col-md-12'
+                        }).append(this.context_screen.screen_container.el))
+                        .prependTo(this.screen_container.filter_box);
+                        return this.context_screen.new_(false).then(function(record) {
+                            // Set manually default to get context_screen_prm
+                            // resolved when default is set.
+                            return record.default_get();
+                        });
+                    }.bind(this));
+            }
+
             if (!attributes.row_activate) {
                 this.row_activate = this.default_row_activate;
             } else {
@@ -717,6 +753,23 @@
             return _switch();
         },
         search_filter: function(search_string) {
+            if (this.context_screen) {
+                if (this.context_screen_prm.state() == 'pending') {
+                    return this.context_screen_prm.then(function() {
+                        return this.search_filter(search_string);
+                    }.bind(this));
+                }
+                var context_record = this.context_screen.current_record;
+                if (context_record &&
+                        !context_record.validate(null, false, null, true)) {
+                    this.new_group([]);
+                    this.context_screen.display(true);
+                    return jQuery.when();
+                }
+                this.context = jQuery.extend({}, this.context,
+                        this.context_screen.get_on_change_value());
+            }
+
             var domain = [];
             var domain_parser = this.domain_parser();