diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-12-06 12:02:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-12-06 12:02:58 +0100 |
| commit | 8ef7af6afe54fbd59051bbbce76daadd6fdb0e86 (patch) | |
| tree | b21971e972eacc87e198fbc38b48ac9b70d168fc /addons/web/static/src/js/chrome | |
| parent | 010add290342ae1e2887450a381e0d1f0acd34e5 (diff) | |
| parent | f96a797fe6238306ec70d3db013b8a4d348ef181 (diff) | |
[MERGE] forward port branch 11.0 up to f96a797fe62
Diffstat (limited to 'addons/web/static/src/js/chrome')
5 files changed, 8 insertions, 4 deletions
diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js index 25ee9c20cf6..c9eed9b2e64 100644 --- a/addons/web/static/src/js/chrome/action_manager.js +++ b/addons/web/static/src/js/chrome/action_manager.js @@ -608,7 +608,7 @@ var ActionManager = Widget.extend({ }); } - return $.when(action_loaded || null).done(function() { + return $.when(action_loaded || null).then(function() { if (self.inner_widget && self.inner_widget.do_load_state) { return self.inner_widget.do_load_state(state, warm); } diff --git a/addons/web/static/src/js/chrome/search_filters.js b/addons/web/static/src/js/chrome/search_filters.js index e2eff03546d..582af7e70ef 100644 --- a/addons/web/static/src/js/chrome/search_filters.js +++ b/addons/web/static/src/js/chrome/search_filters.js @@ -248,6 +248,10 @@ var Date = DateTime.extend({ attributes: { type: 'date' }, + get_value: function (index) { + // retrieve the datepicker value + return this["datewidget_" + (index || 0)].getValue(); + }, _get_widget_class: function () { return datepicker.DateWidget; }, diff --git a/addons/web/static/src/js/chrome/search_inputs.js b/addons/web/static/src/js/chrome/search_inputs.js index e3e5fec6839..d937a6e246e 100644 --- a/addons/web/static/src/js/chrome/search_inputs.js +++ b/addons/web/static/src/js/chrome/search_inputs.js @@ -153,7 +153,7 @@ var Field = Input.extend( /** @lends instance.web.search.Field# */ { value_to_domain = function (facetValue) { return Domain.prototype.stringToArray( domain, - {self: self.value_from(facetValue)} + {self: self.value_from(facetValue), raw_value: facetValue.attributes.value} ); }; } else { diff --git a/addons/web/static/src/js/chrome/search_view.js b/addons/web/static/src/js/chrome/search_view.js index ecd7db41a7d..7b7b3afcd70 100644 --- a/addons/web/static/src/js/chrome/search_view.js +++ b/addons/web/static/src/js/chrome/search_view.js @@ -339,7 +339,7 @@ var SearchView = Widget.extend({ }, set_default_filters: function () { var self = this, - default_custom_filter = this.$buttons && this.favorite_menu.get_default_filter(); + default_custom_filter = this.$buttons && this.favorite_menu && this.favorite_menu.get_default_filter(); if (!self.options.disable_custom_filters && default_custom_filter) { return this.favorite_menu.toggle_filter(default_custom_filter, true); } diff --git a/addons/web/static/src/js/chrome/view_manager.js b/addons/web/static/src/js/chrome/view_manager.js index 5c32715a98f..75029d4cc27 100644 --- a/addons/web/static/src/js/chrome/view_manager.js +++ b/addons/web/static/src/js/chrome/view_manager.js @@ -542,7 +542,7 @@ var ViewManager = Widget.extend(ControlPanelMixin, { stateChanged = true; } if (stateChanged) { - this.switch_mode(state.view_type); + return this.switch_mode(state.view_type); } }, /** |
