[FIX] re-add auto_search
lp bug: https://launchpad.net/bugs/908696 fixed bzr revid: xmo@openerp.com-20120118144826-3aio04bfrf35wx7i
This commit is contained in:
parent
448555efbc
commit
f1e60702e3
|
@ -310,11 +310,15 @@ session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.View
|
||||||
this.views[view_type].deferred.resolve(view_type);
|
this.views[view_type].deferred.resolve(view_type);
|
||||||
$.when(view_promise).then(function() {
|
$.when(view_promise).then(function() {
|
||||||
self.on_controller_inited(view_type, controller);
|
self.on_controller_inited(view_type, controller);
|
||||||
if (self.searchview && view.controller.searchable !== false) {
|
if (self.searchview
|
||||||
|
&& self.flags.auto_search !== false
|
||||||
|
&& view.controller.searchable !== false) {
|
||||||
self.searchview.ready.then(self.searchview.do_search);
|
self.searchview.ready.then(self.searchview.do_search);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else if (this.searchview && view.controller.searchable !== false) {
|
} else if (this.searchview
|
||||||
|
&& self.flags.auto_search !== false
|
||||||
|
&& view.controller.searchable !== false) {
|
||||||
this.searchview.ready.then(this.searchview.do_search);
|
this.searchview.ready.then(this.searchview.do_search);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -448,6 +452,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
|
||||||
// do not have it yet (and we don't, because we've not called our own
|
// do not have it yet (and we don't, because we've not called our own
|
||||||
// ``_super()``) rpc requests will blow up.
|
// ``_super()``) rpc requests will blow up.
|
||||||
var flags = action.flags || {};
|
var flags = action.flags || {};
|
||||||
|
flags.auto_search = !!action.auto_search;
|
||||||
if (action.res_model == 'board.board' && action.view_mode === 'form') {
|
if (action.res_model == 'board.board' && action.view_mode === 'form') {
|
||||||
// Special case for Dashboards
|
// Special case for Dashboards
|
||||||
_.extend(flags, {
|
_.extend(flags, {
|
||||||
|
|
Loading…
Reference in New Issue