[imp] clear search filter when using an advanced filter

bzr revid: nicolas.vanhoren@openerp.com-20120106150826-fzhg02asqf8o828w

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 27441a6..52caab5 100644 (file)
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -255,7 +255,9 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             val = val.slice(4);
             val = parseInt(val, 10);
             var filter = this.managed_filters[val];
-            this.on_search([filter.domain], [filter.context], []);
+            this.do_clear().then(_.bind(function() {
+                this.on_search([filter.domain], [filter.context], []);
+            }, this));
         } else {
             select.val('');
         }
@@ -417,7 +419,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
                 input.datewidget.set_value(false);
             }
         });
-        setTimeout(this.on_clear, 0);
+        return $.async_when().pipe(this.on_clear);
     },
     /**
      * Triggered when the search view gets cleared