diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-10-25 16:37:38 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-10-25 16:37:38 +0200 |
| commit | 59c9d34417feb2f4ac84efb2cf2fe153dc864276 (patch) | |
| tree | 03b959243b7abeac712474b5e18dbe76421b1e21 /addons/web/static/src | |
| parent | 69f909a9a16e55f17e4bb76324ce8b2f21670dac (diff) | |
[ADD] title to all viewmanager variants
Uses the string of the current view arch by default, overridden with action name by ViewManagerAction.
Mostly of use for/with o2m and m2m fields
bzr revid: xmo@openerp.com-20111025143738-yugscol5kabg8whv
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views.js | 17 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 6 |
2 files changed, 19 insertions, 4 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 78abe6a8fdb..3c1889e66c9 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -271,6 +271,10 @@ session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.View } } } + $.when(view_promise).then(function () { + self.$element.find('.oe_view_title:first').text( + self.display_title()); + }); return view_promise; }, /** @@ -331,7 +335,15 @@ session.web.ViewManager = session.web.Widget.extend(/** @lends session.web.View /** * Called by children view after executing an action */ - on_action_executed: function () {} + on_action_executed: function () {}, + display_title: function () { + var view = this.views[this.active_view]; + if (view) { + // ick + return view.controller.fields_view.arch.attrs.string; + } + return ''; + } }); session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepnerp.web.ViewManagerAction# */{ @@ -522,6 +534,9 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner return false; }); }); + }, + display_title: function () { + return this.action.name; } }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 7e081520ffc..da96ad8be8b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -415,6 +415,9 @@ <tr> <td class="view-manager-main-content"> <div class="oe-view-manager-header"> + <h2 class="oe_view_title" t-if="self.flags.display_title !== false"> + <t t-esc="self.display_title()"/> + </h2> <div class="oe_vm_switch"> <t t-if="views.length != 1" t-foreach="views" t-as="view"> <button type="button" t-att-data-view-type="view.view_type"> @@ -452,9 +455,6 @@ <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"> <ul class="oe-view-manager-logs"></ul> |