diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-01-25 15:20:43 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-01-25 15:20:43 +0100 |
| commit | f854b4b9f81073cd3e3d39836269e62bdec9abdb (patch) | |
| tree | c71fe4d5070d5ad86b2350a9d3fbcfea4a9d8c69 /addons/web/static/src | |
| parent | e90d6ac735f5c1f9f62f483ae4705144cc6fe8bb (diff) | |
[IMP] only set auto_search on flags if not already set, so flags can be used to override action's auto_search
bzr revid: xmo@openerp.com-20120125142043-o9znm8qphrm9rlsp
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 49150681d08..b52c965402b 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -453,7 +453,9 @@ 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 // ``_super()``) rpc requests will blow up. var flags = action.flags || {}; - flags.auto_search = action.auto_search !== false; + if (!('auto_search' in flags)) { + flags.auto_search = action.auto_search !== false; + } if (action.res_model == 'board.board' && action.view_mode === 'form') { // Special case for Dashboards _.extend(flags, { |