From 1d0b38d034f2f898f191acdc84200be00db6be5b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Oct 2011 14:23:35 +0200
Subject: [PATCH] [FIX] No title on page trigered by an action

lp bug: https://launchpad.net/bugs/872148 fixed

bzr revid: fme@openerp.com-20111017122335-vov2sy95sdt3dwp9
---
 addons/web/static/src/js/views.js  | 12 +++++++++---
 addons/web/static/src/xml/base.xml | 10 +++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index a12b30f0380..32e17db641f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -431,10 +431,16 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
     on_mode_switch: function (view_type) {
         var self = this;
         return $.when(
-            this._super(view_type),
-            this.shortcut_check(this.views[view_type])).then(function () {
-                var view_id = self.views[self.active_view].controller.fields_view.view_id;
+                this._super(view_type),
+                this.shortcut_check(this.views[view_type])
+            ).then(function() {
+                var controller = self.views[self.active_view].controller,
+                    fvg = controller.fields_view,
+                    view_id = (fvg && fvg.view_id) || '--';
                 self.$element.find('.oe_get_xml_view span').text(view_id);
+                if (!self.action.name && fvg) {
+                    self.$element.find('.oe_view_title').text(fvg.arch.attrs.string || fvg.name);
+                }
         });
     },
     shortcut_check : function(view) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a0aafead6fa..7720ae2d38b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -449,11 +449,11 @@
         </blockquote>
     	<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
     	   href="javascript: void(0)"> </a>
-        <h2 class="oe_view_title" t-if="self.session.debug || self.flags.display_title !==false">
-            <t t-if="self.flags.display_title !==false" t-esc="self.action.name"/>
-            <button t-if="self.session.debug" class="oe_get_xml_view">
-                View#<span></span>
-            </button>
+        <button t-if="self.session.debug" class="oe_get_xml_view">
+            View#<span></span>
+        </button>
+        <h2 class="oe_view_title" t-if="self.flags.display_title !== false">
+            <t t-if="self.flags.display_title !== false" t-esc="self.action.name"/>
         </h2>
     </t>
     <t t-jquery=".oe-view-manager-header" t-operation="after">