diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-02-01 10:51:33 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-02-01 10:51:33 +0100 |
| commit | 0d3004e8290b7d9ff90d1f84ee7353b6a9e75694 (patch) | |
| tree | a893156c835c6b7cf6a929f9eb34349375fbdca2 /addons/web/static/src | |
| parent | d8f18175b9cb1064ba8589a8fd85812e519c7966 (diff) | |
[IMP] view: only first alias displayed
bzr revid: chm@openerp.com-20130201095133-i3p6vehexh7a9bqh
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views.js | 20 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
2 files changed, 5 insertions, 17 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 625f50ca2f8..4b532e633be 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1406,23 +1406,11 @@ instance.web.View = instance.web.Widget.extend({ 'model': this.options.action.res_model, 'alias_defaults': context.help_alias }).then(function (alias_ids) { - if (alias_ids.length) { + if (alias_ids.length && alias_ids[0].email.match(/@.+/)) { + // alias_ids[0].global var $alias = $(QWeb.render('View.nocontent_alias')); - var global = false; - var inc = 0; - _.each(alias_ids, function (alias_id) { - if (alias_id.email.match(/@.+/)) { - if (inc && global != alias_id.global) { - $alias.append('<br/>' + _t("or")); - global = alias_id.global; - } - $alias.append('<br/><a href="mailto:' + alias_id.email + '">' + alias_id.email + '</a>'); - inc++; - } - }) - if(inc) { - $dom.append($alias); - } + $alias.append('<a href="mailto:' + alias_ids[0].email + '">' + alias_ids[0].email + '</a>'); + $dom.append($alias); } }); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 30a3f8f2351..47eb0214616 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1873,7 +1873,7 @@ </t> <t t-name="View.nocontent_alias"> <p class="oe_view_nocontent_alias"> - You can also create the document by sending an email to : + You can also create documents by sending an email to: </p> </t> </templates> |