diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-11-14 13:20:33 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-11-14 13:20:33 +0100 |
| commit | a43662d1254dba1333cdc74bf01a3c7dcef76de7 (patch) | |
| tree | 42778e073184816fef8c607266b98c45b349f467 /addons/mail/static/src | |
| parent | 758115c1a56a83d804b71e583073403decdc4ee4 (diff) | |
[IMP] mail: change the header title and description for each mailbox and group discussion
bzr revid: chm@openerp.com-20121114122033-dl70fqty2kbd5gj1
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 39d843b7e70..6cd7c576781 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -1591,7 +1591,7 @@ openerp.mail = function (session) { this.action = _.clone(action); this.domain = this.action.params.domain || this.action.domain || []; - this.context = this.action.params.context || this.action.context || {}; + this.context = _.extend(this.action.params.context || {}, this.action.context || {}); this.defaults = {}; for (var key in this.context) { diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index ab371dfd358..2b9db8f195f 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -137,9 +137,15 @@ <td colspan="2"> <h2 class="oe_view_title"> <span class="oe_view_title_text"> - Email box + <t t-raw="widget.action.name"/> </span> </h2> + <t t-if="widget.action.params.header_description"> + <br/> + <span class="oe_view_subtitle_text"> + <t t-raw="widget.action.params.header_description"/> + </span> + </t> </td> <td><div class="oe_view_manager_view_search" t-opentag="true"/></td> </tr> |