diff options
Diffstat (limited to 'addons/mail/static')
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 5 | ||||
| -rw-r--r-- | addons/mail/static/src/js/many2many_tags_email.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 11 |
3 files changed, 2 insertions, 16 deletions
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 17dd4b57cd0..99a7751e15e 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -507,18 +507,15 @@ openerp.mail = function (session) { } $.when(recipient_done).done(function (partner_ids) { var context = { - 'default_composition_mode': default_composition_mode, 'default_parent_id': self.id, 'default_body': mail.ChatterUtils.get_text2html(self.$el ? (self.$el.find('textarea:not(.oe_compact)').val() || '') : ''), 'default_attachment_ids': _.map(self.attachment_ids, function (file) {return file.id;}), 'default_partner_ids': partner_ids, + 'default_is_log': self.is_log, 'mail_post_autofollow': true, 'mail_post_autofollow_partner_ids': partner_ids, 'is_private': self.is_private }; - if (self.is_log) { - _.extend(context, {'mail_compose_log': true}); - } if (default_composition_mode != 'reply' && self.context.default_model && self.context.default_res_id) { context.default_model = self.context.default_model; context.default_res_id = self.context.default_res_id; diff --git a/addons/mail/static/src/js/many2many_tags_email.js b/addons/mail/static/src/js/many2many_tags_email.js index cc701e8a585..5d36262f5b9 100644 --- a/addons/mail/static/src/js/many2many_tags_email.js +++ b/addons/mail/static/src/js/many2many_tags_email.js @@ -44,7 +44,7 @@ instance.web.form.FieldMany2ManyTagsEmail = instance.web.form.FieldMany2ManyTags new instance.web.Model('res.partner').call("search", [[ ["id", "in", ids], ["email", "=", false], - ["notification_email_send", "in", ['all', 'comment']] ]], + ["notify_email", "=", 'always'] ]], {context: this.build_context()}) .then(function (record_ids) { // valid partner diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 28cbbca1f2c..06af2303239 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -189,17 +189,6 @@ </td> <td><div class="oe_view_manager_view_search" t-opentag="true"/></td> </tr> - <tr class="oe_header_row" t-if="widget.action.params.view_inbox and widget.action.params.show_compose_message" > - <td colspan="2"> - <button type="button" class="oe_write_full oe_highlight"> - Compose a new message - </button> - <span class='oe_alternative'> - or - <a href='#' class='oe_write_onwall oe_bold' help='Your followers can read this message'>Write to my followers</a> - </span> - </td> - </tr> </tbody> </table> <div class="oe_mail-placeholder"></div> |