summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorMartin Geubelle <mge@odoo.com>2018-12-18 10:42:37 +0000
committerMartin Geubelle <mge@odoo.com>2018-12-18 12:55:19 +0000
commit243734e64bba1b7f0513d34e94ff16105fb449f0 (patch)
tree32b990406b62e7e717da97717cad7b04a6a726ed /addons/web/static/src
parentca895942154ae47522515d8c9ef7026bc1bfe729 (diff)
[FIX] web: backspace in empty searchbar input
Before this rev. a crash occurred when pressing backspace in the control panel view searchbar input if there was no facet to remove. The use case is now correctly handled and nothing happens. Task 1902826 closes odoo/odoo#29602
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/control_panel/control_panel_controller.js9
-rw-r--r--addons/web/static/src/js/views/control_panel/control_panel_renderer.js2
2 files changed, 5 insertions, 6 deletions
diff --git a/addons/web/static/src/js/views/control_panel/control_panel_controller.js b/addons/web/static/src/js/views/control_panel/control_panel_controller.js
index 991cee949e8..3d6e62f4bf9 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_controller.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_controller.js
@@ -160,12 +160,11 @@ var ControlPanelController = mvc.Controller.extend({
*/
_onFacetRemoved: function (ev) {
ev.stopPropagation();
- var group = ev.data.group;
- if (!group) {
- group = this.renderer.getLastFacet();
+ var group = ev.data.group || this.renderer.getLastFacet();
+ if (group) {
+ this.model.deactivateGroup(group.id);
+ this._reportNewQueryAndRender();
}
- this.model.deactivateGroup(group.id);
- this._reportNewQueryAndRender();
},
/**
* @private
diff --git a/addons/web/static/src/js/views/control_panel/control_panel_renderer.js b/addons/web/static/src/js/views/control_panel/control_panel_renderer.js
index eea7fdae430..665fe73bf7d 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_renderer.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_renderer.js
@@ -102,7 +102,7 @@ var ControlPanelRenderer = Renderer.extend({
//--------------------------------------------------------------------------
/**
- * @returns {Object}
+ * @returns {Object|undefined}
*/
getLastFacet: function () {
return this.state.facets.slice(-1)[0];