[MERGE] from trunk

bzr revid: chm@openerp.com-20121017073146-9m5s2hffeekmj068

3 files changed, 7 insertions, 14 deletions

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6211ca911ea..83f234f3d33 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1228,14 +1228,7 @@ openerp.mail = function(session) {
         _check_visibility: function() {
             this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
-
-        /**
-         * Reinitialize the widget field and Display the threads
-         * @param {Object} new_context: context of the refresh
-          */
-        set_value: function() {
-            var self = this;
-            this._super.apply(this, arguments);
+        render_value: function() {
             if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
                 this.$('oe_mail_thread').hide();
                 return;
@@ -1343,7 +1336,7 @@ openerp.mail = function(session) {
                 domains: domains || [],
                 contexts: contexts || [],
                 group_by_seq: groupbys || []
-            }, function (results) {
+            }).then(function (results) {
                 self.search_results['context'] = results.context;
                 self.search_results['domain'] = results.domain;
                 self.thread.destroy();
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 2367705f1e9..58b7e910cb8 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -88,9 +88,9 @@ openerp_mail_followers = function(session, mail) {
             });
         },
 
-        set_value: function(value_) {
+        render_value: function() {
             this.reinit();
-            return this.fetch_followers(value_  || this.get_value());
+            return this.fetch_followers(this.get("value"));
         },
 
         set_is_follower: function(value_) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 216322003b5..a225fcc7f63 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,7 +68,7 @@
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
                     <t t-if="widget.options.thread.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
-                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
+                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
                     </t>
 
                 </li>
@@ -276,8 +276,8 @@
         </span>
         <button t-attf-class="oe_msg_vote oe_tag">
             <span>
-                <t t-if="!widget.datasets.has_voted">Agree</t>
-                <t t-if="widget.datasets.has_voted">Unagree</t>
+                <t t-if="!widget.has_voted">Agree</t>
+                <t t-if="widget.has_voted">Undo</t>
             </span>
         </button>
     </span>