summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorDenis Ledoux <dle@odoo.com>2014-11-04 17:54:48 +0100
committerDenis Ledoux <dle@odoo.com>2014-11-04 17:54:48 +0100
commitf7a76cbb17093784b4e4fc8fdb449819133b18a6 (patch)
treedb7383c95ca9481098f3cc4db48998ff4a85f531 /addons/web/static/src
parent8c4a7cb37143285da0a1a25d0d5e720c45e4346a (diff)
parentbe7c894cfd4940004f694ed66beefd45f8e98c0f (diff)
[MERGE] forward port of branch 7.0 up to be7c894
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views.js3
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 2a82ef0664c..804f62230e4 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -365,12 +365,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
});