diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-08-11 15:52:15 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-08-11 15:58:02 +0200 |
| commit | ae65be2b2ae98860f70a7e6f3d7679c40ea9bd93 (patch) | |
| tree | 15529b8a6658361866b94af8616732f9c317ba0d /addons/mail | |
| parent | c64b07736204c0f9f575ee167879ccbdf4603645 (diff) | |
| parent | 0739bc4edabab7e74571087c01a2da68ccadb10e (diff) | |
[MERGE] forward port of branch saas-5 up to 0739bc4
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/mail_followers.py | 1 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py index e8dd37e0ad9..c57be5a1913 100644 --- a/addons/mail/mail_followers.py +++ b/addons/mail/mail_followers.py @@ -67,6 +67,7 @@ class mail_followers(osv.Model): self.invalidate_cache(cr, uid, context=context) return res + _sql_constraints = [('mail_followers_res_partner_res_model_id_uniq','unique(res_model,res_id,partner_id)','Error, a partner cannot follow twice the same object.')] class mail_notification(osv.Model): """ Class holding notifications pushed to partners. Followers and partners diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 14818313d36..bf5430c52de 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -50,10 +50,11 @@ <t t-if="!widget.options.view_mailbox"> <div class="field_text oe_compact oe_compact_record"> <a class="oe_compose_post" t-if="widget.options.compose_placeholder"><t t-raw="widget.options.compose_placeholder"/></a> - <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Send a message</a> + <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" + title="Send a message to all followers of the document">Send a message</a> <t t-if="widget.options.display_log_button"> <span class="oe_grey oe_sep_word">or</span> - <a class="oe_compose_log">Log an internal note</a> + <a class="oe_compose_log" title="Log a note for this document. No notification will be sent">Log an internal note</a> </t> </div> </t> |