diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-11-04 18:05:58 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-11-04 18:05:58 +0100 |
| commit | fab2e29d50ba2409eabdb0c29c7750d48dc2306f (patch) | |
| tree | f22bcc534aa3a8b9752040170d558bfb4e650f3f /addons/web/static/src | |
| parent | 29da331f925980ae7b6b6fb3b926c764c34af8cc (diff) | |
| parent | f7a76cbb17093784b4e4fc8fdb449819133b18a6 (diff) | |
[MERGE] forward port of branch saas-3 up to f7a76cb
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 739a36d196b..889d101e4bf 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -370,12 +370,13 @@ instance.web.ActionManager = instance.web.Widget.extend({ var type = action.type.replace(/\./g,'_'); var popup = action.target === 'new'; var inline = action.target === 'inline' || action.target === 'inlineview'; + var form = _.str.startsWith(action.view_mode, 'form'); action.flags = _.defaults(action.flags || {}, { views_switcher : !popup && !inline, search_view : !popup && !inline, action_buttons : !popup && !inline, sidebar : !popup && !inline, - pager : !popup && !inline, + pager : (!popup || !form) && !inline, display_title : !popup, search_disable_custom_filters: action.context && action.context.search_disable_custom_filters }); |
