[MERGE] branch trunk-v62_config: support for new config wizards

bzr revid: rco@openerp.com-20120405144731-f0ckc6bgf8p0ufe0

1 files changed, 6 insertions, 5 deletions

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 43ecc8444fc..cfc09a0fb4e 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -112,12 +112,13 @@ session.web.ActionManager = session.web.OldWidget.extend({
         }
         var type = action.type.replace(/\./g,'_');
         var popup = action.target === 'new';
+        var inline = action.target === 'inline';
         action.flags = _.extend({
-            views_switcher : !popup,
-            search_view : !popup,
-            action_buttons : !popup,
-            sidebar : !popup,
-            pager : !popup,
+            views_switcher : !popup && !inline,
+            search_view : !popup && !inline,
+            action_buttons : !popup && !inline,
+            sidebar : !popup && !inline,
+            pager : !popup && !inline,
             display_title : !popup
         }, action.flags || {});
         if (!(type in this)) {