[REV] Revert #4770. Will break something in buttons type objects.
authorFabien Meghazi <fme@openerp.com>
Tue, 10 May 2011 11:42:50 +0000 (13:42 +0200)
committerFabien Meghazi <fme@openerp.com>
Tue, 10 May 2011 11:42:50 +0000 (13:42 +0200)
bzr revid: fme@openerp.com-20110510114250-q91x3c97sxtfxb16

addons/base/static/src/js/views.js

index 92609e1..55d2543 100644 (file)
@@ -275,17 +275,14 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
         // init search view
         var searchview_id = this.action.search_view_id && this.action.search_view_id[0];
 
-        if (searchview_id) {
-            var searchview_loaded = this.setup_search_view(
-                    searchview_id, search_defaults);
+        var searchview_loaded = this.setup_search_view(
+                searchview_id || false, search_defaults);
 
-            // schedule auto_search
-            if (this.action['auto_search']) {
-                $.when(searchview_loaded, inital_view_loaded)
-                    .then(this.searchview.do_search);
-            }
+        // schedule auto_search
+        if (searchview_loaded != null && this.action['auto_search']) {
+            $.when(searchview_loaded, inital_view_loaded)
+                .then(this.searchview.do_search);
         }
-
     },
     stop: function() {
         // should be replaced by automatic destruction implemented in BaseWidget