diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-13 14:08:51 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-13 14:08:51 +0200 |
| commit | 7f2a9e77b6dbe65e3977f8a3b15de1785bc5d7d3 (patch) | |
| tree | 9a6232b1dcf1f0435b1332c126a8d9cfdc683e64 /addons/mail/static | |
| parent | 89873cbed5fb31547843a7a135145d46986431af (diff) | |
| parent | dcab356b38aad5d6c7940c0211a3a940a8be9a65 (diff) | |
[MERGE] forward port of branch 9.0 up to dcab356
Diffstat (limited to 'addons/mail/static')
| -rw-r--r-- | addons/mail/static/src/js/chatter.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/js/composer.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js index 19074d1eb45..41c087a638b 100644 --- a/addons/mail/static/src/js/chatter.js +++ b/addons/mail/static/src/js/chatter.js @@ -898,7 +898,7 @@ var Chatter = form_common.AbstractField.extend({ internal_subtypes: this.options.internal_subtypes, is_log: options && options.is_log, record_name: this.record_name, - default_body: old_composer && old_composer.$input.val(), + default_body: old_composer && old_composer.$input && old_composer.$input.val(), default_mention_selections: old_composer && old_composer.mention_get_listener_selections(), }); this.composer.on('input_focused', this, function () { diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js index 5ff9b5ec9dc..8dd44ac2ea1 100644 --- a/addons/mail/static/src/js/composer.js +++ b/addons/mail/static/src/js/composer.js @@ -343,7 +343,7 @@ var BasicComposer = Widget.extend({ input_min_height: 28, mention_fetch_limit: 8, mention_partners_restricted: false, // set to true to only suggest prefetched partners - send_text: _('Send'), + send_text: _t('Send'), default_body: '', default_mention_selections: {}, }); |