From c92422b2ace39a0dde2cb1952da4a26159257377 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 9 Aug 2012 15:23:41 +0530
Subject: [PATCH 01/21] [ADD]: Add vote system in openchatter

bzr revid: atp@tinyerp.com-20120809095341-xn70i8beof20b07h
---
 addons/mail/__init__.py                  |   1 +
 addons/mail/mail_message.py              |  41 +++++++++++++++++++
 addons/mail/mail_thread.py               |  14 ++++++-
 addons/mail/mail_vote.py                 |  36 +++++++++++++++++
 addons/mail/security/ir.model.access.csv |   1 +
 addons/mail/static/src/css/mail.css      |  29 ++++++++++++++
 addons/mail/static/src/img/vote.gif      | Bin 0 -> 892 bytes
 addons/mail/static/src/js/mail.js        |  48 ++++++++++++++++++++++-
 addons/mail/static/src/xml/mail.xml      |  22 ++++++++++-
 9 files changed, 188 insertions(+), 4 deletions(-)
 create mode 100644 addons/mail/mail_vote.py
 create mode 100644 addons/mail/static/src/img/vote.gif

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index cbd477f55e6..4cf2caf8804 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -24,6 +24,7 @@ import mail_message
 import mail_thread
 import mail_group
 import mail_subscription
+import mail_vote
 import ir_needaction
 import res_users
 import res_partner
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b96b6e3791e..1b5178e7271 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -230,6 +230,7 @@ class mail_message(osv.Model):
             select=True, ondelete='set null',
             help="Parent message, used for displaying as threads with hierarchy"),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
+        'vote_ids': fields.one2many('mail.vote', 'msg_id', 'Votes'),
     }
         
     _defaults = {
@@ -237,6 +238,46 @@ class mail_message(osv.Model):
         'state': 'received',
     }
     
+    
+    #---------------------------------------------------
+    #Mail Vote system (Like or Unlike comments
+    #-----------------------------------------------------
+    
+    def get_vote_summary(self, cr, uid, ids, context=None):
+        '''
+        Return message ,count vote of message id given by .particular user with True or False.
+        '''
+        for message in self.browse(cr, uid, ids, context):
+            is_vote_liked = False
+            vote_count = len(message.vote_ids)
+            for vote in message.vote_ids:
+                if vote.user_id.id == uid:
+                    is_vote_liked = True
+                    break
+            res = {
+                'msg_id': message.id,
+                'vote_count': vote_count,
+                'is_vote_liked': is_vote_liked
+            }
+        return res
+    
+    def vote_toggle(self, cr, uid, ids, context=None):
+        '''
+        Toggles when Comment is liked or unlike.
+        Return the number of votes of particular message.
+        '''
+        vote_pool = self.pool.get('mail.vote')
+        vote_count = 0
+        for message in self.browse(cr, uid, ids, context):
+            voters_id = vote_pool.search(cr, uid, [('msg_id', '=', message.id), ('user_id', '=', uid)], context=context)
+            if not voters_id:
+                new_vote_id =  vote_pool.create(cr, uid, {'msg_id': message.id, 'user_id': uid}, context=context)
+            else:
+                vote_pool.unlink(cr, uid, voters_id, context=context)
+            if message.vote_ids:
+                vote_count = len(message.vote_ids)    
+        return vote_count 
+
     #------------------------------------------------------
     # Email api
     #------------------------------------------------------
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index f0dd023bf06..092050ff812 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -64,12 +64,14 @@ class mail_thread(osv.Model):
 
     def _get_message_ids(self, cr, uid, ids, name, args, context=None):
         res = {}
+        img_vote = "<img  class='oe_mail_vote_image'  src='/mail/static/src/img/vote.gif'/>"
         for id in ids:
             message_ids = self.message_search(cr, uid, [id], context=context)
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
+            vote_list = self.message_vote_ids(cr, uid, ids, context=context)
             res[id] = {
                 'message_ids': message_ids,
-                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_summary': "<span>Msg: %d</span> . <span>Fol: %d</span> . <span> %s  %d</span>" % (len(message_ids), len(subscriber_ids), img_vote, len(vote_list)),
             }
         return res
 
@@ -100,7 +102,15 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
     # Automatic subscription when creating/reading
     #------------------------------------------------------
-
+    def message_vote_ids(self, cr, uid, ids, context=None):
+        message_pool = self.pool.get('mail.message')
+        vote_list = []
+        message_ids = self.message_search(cr, uid, [id], context=context)
+        for message in message_pool.browse(cr, uid, message_ids, context=context):
+            if message.vote_ids:
+                vote_list.append(message.vote_ids)
+        return vote_list
+    
     def create(self, cr, uid, vals, context=None):
         """Automatically subscribe the creator """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
new file mode 100644
index 00000000000..5d63de80864
--- /dev/null
+++ b/addons/mail/mail_vote.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class mail_vote(osv.Model):
+    '''
+    Mail vote feature allow users to like and unlike particular  message or Document's message comment.
+    It counts the number of votes per document.
+    '''
+    _name = 'mail.vote'
+    _description = 'Mail Vote'
+    _columns = {
+            'msg_id': fields.many2one('mail.message', 'Message', required=True),
+            'user_id': fields.many2one('res.users', 'User', required=True),
+        }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 3677d424c14..1941a41a259 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -7,3 +7,4 @@ access_mail_notification_all,mail.notification.all,model_mail_notification,,1,1,
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
 access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
 access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
+access_mail_vote,mail.vote,model_mail_vote,base.group_user,1,1,1,1
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index c0317633aa7..ae934eeb4ff 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -275,6 +275,35 @@
     display: none;
 }
 
+/*--------------------------------------------------------------*/
+/* Mail Vote System (Like or Unlike Comment)
+/*--------------------------------------------------------------*/
+
+.oe_mail_vote_image{
+    height='12px';
+    width='16px';	
+}
+
+button.oe_mail_msg_vote_like{
+    height:21px;
+    width: 30px;
+    padding: 1px;
+    background: #8A89BA;
+    margin-top: -4px;
+}
+
+button.oe_mail_msg_vote_like:hover{
+    background: #8A89BA;
+}
+
+button.oe_mail_msg_vote_like span {
+    color: white;
+}
+
+span.oe_mail_vote_string{
+    color: #807FB4;
+}
+
 /* ------------------------------------------------------------ */
 /* mail.compose.message form view & OpenERP hacks
 /* ------------------------------------------------------------ */
diff --git a/addons/mail/static/src/img/vote.gif b/addons/mail/static/src/img/vote.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0e6b874770e1122b3f08f01d26bae9f08b94cfe6
GIT binary patch
literal 892
zcmZ?wbhEHb<Y(Yz_|5<VqN1Ym^75*xs@mGx*4Ebc_Vy7G5m{MT-QC>_7cRVe_wN7y
z|G^4JiO~=kZXuxflZBCi;Xi{8$YY>9!N3v8@Sju0!k~eniGy7zp};`#5CadBg-XW)
zha;V=k}f;~2O1ohWSp~PDnG_IFtaO6lF_`F(#WJ0K8@#t(X&(2OcGCB>Da7xoQcbW
V?}tRu!6p_1OTLJPi-`^l)&OE6GJpU8

literal 0
HcmV?d00001

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index da6816d3441..8b60e96744c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -559,6 +559,48 @@ openerp.mail = function(session) {
             return display_done && compose_done;
         },
 
+        //Mail vote Functionality...
+        add_vote_event: function(element){
+            vote_img = element.find('.oe_mail_msg_vote_like');
+            self = this;
+            if (vote_img)
+                vote_img.click(function(){
+                    self.subscribe_vote($(this).attr('data-id'));
+                });
+            return
+        },
+        
+        find_parent_element: function(name, message_id){
+            parent_element = false;
+            _.each($(name), function(element){
+                if ($(element).attr("data-id") == message_id){
+                    parent_element = element;
+                }
+            });
+            return parent_element;
+         },
+
+        render_vote: function(message_id){
+            var self = this;
+            this.mail_message = new session.web.DataSet(this, 'mail.message');
+            this.mail_message.call('get_vote_summary',[[parseInt(message_id)]]).then(function(result){
+                if (result){
+                    parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
+                    vote_element = session.web.qweb.render('VoteDisplay', result);
+                    $(parent_element).html(vote_element);
+                    self.add_vote_event($(parent_element));
+                }
+            });
+        },
+        
+        subscribe_vote: function(message_id){
+            var self = this;
+            this.mail_message = new session.web.DataSet(this, 'mail.message');
+            return this.mail_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
+                    self.render_vote(message_id);
+            });
+        },
+         
         /**
          * Override-hack of do_action: automatically reload the chatter.
          * Normally it should be called only when clicking on 'Post/Send'
@@ -697,6 +739,10 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
+            //Render Vote.
+            _.each(records, function(record){
+                self.render_vote(record.id);
+            });
             // sort the records
             mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
             //build attachments download urls and compute time-relative from dates
@@ -1119,7 +1165,7 @@ openerp.mail = function(session) {
                 var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
                 var model_name = self.comments_structure.msgs[root_id]['model'];
                 var res_id = self.comments_structure.msgs[root_id]['res_id'];
-                var render_res = session.web.qweb.render('mail.wall_thread_container', {});
+                var render_res = session.web.qweb.render('mail.Wall_thread_container', {});
                 $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
                 var thread = new mail.Thread(self, {
                     'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 86d115f29c8..bd18d78e41d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -45,7 +45,7 @@
         wall_thread_container template for the wall
         Each discussion thread is contained inside this template
         -->
-    <t t-name="mail.wall_thread_container">
+    <t t-name="mail.Wall_thread_container">
     </t>
 
     <!--
@@ -118,6 +118,25 @@
         </div>
     </ul>
 
+    <!-- Vote system (Like or Unlike -->
+    <t t-name="VoteDisplay">
+        <t t-if='vote_count'>
+             <span class="oe_left oe_mail_vote_string">Votes :<t t-esc="vote_count"/></span>
+        </t>
+        <li>
+        <t t-if="!is_vote_liked">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Vote.">
+                <span>+1</span>
+            </button>
+        </t>
+        <t t-if="is_vote_liked">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:2px">
+                <span>-1</span>
+            </button>
+        </t>
+        </li>
+    </t>
+
     <!-- default layout -->
     <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
@@ -155,6 +174,7 @@
                       <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
                       <li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
+                      <li> <span t-att-data-id="record.id" class="oe_mail_msg_vote"></span> </li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote
                       <li><a href="#">Like</a></li>

From 9ef2d144be84664210c2a4997ee59944e8199ff3 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 9 Aug 2012 15:42:15 +0530
Subject: [PATCH 02/21] [FIX]: Fix for message_id search problem

bzr revid: atp@tinyerp.com-20120809101215-dcmt2o1l88rvy10d
---
 addons/mail/mail_thread.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 092050ff812..4ba58a029ea 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -68,7 +68,7 @@ class mail_thread(osv.Model):
         for id in ids:
             message_ids = self.message_search(cr, uid, [id], context=context)
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
-            vote_list = self.message_vote_ids(cr, uid, ids, context=context)
+            vote_list = self.message_vote_ids(cr, uid, message_ids, context=context)
             res[id] = {
                 'message_ids': message_ids,
                 'message_summary': "<span>Msg: %d</span> . <span>Fol: %d</span> . <span> %s  %d</span>" % (len(message_ids), len(subscriber_ids), img_vote, len(vote_list)),
@@ -105,8 +105,7 @@ class mail_thread(osv.Model):
     def message_vote_ids(self, cr, uid, ids, context=None):
         message_pool = self.pool.get('mail.message')
         vote_list = []
-        message_ids = self.message_search(cr, uid, [id], context=context)
-        for message in message_pool.browse(cr, uid, message_ids, context=context):
+        for message in message_pool.browse(cr, uid, ids, context=context):
             if message.vote_ids:
                 vote_list.append(message.vote_ids)
         return vote_list

From f2cb572602e3881a5699f0cb1754050488390d0e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 9 Aug 2012 17:20:32 +0530
Subject: [PATCH 03/21] [REM]: Remove vote from message_summary

bzr revid: atp@tinyerp.com-20120809115032-ffl9v3tcqxuktnn9
---
 addons/mail/mail_thread.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index af30ce3630e..9cbf193a1c7 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -64,14 +64,12 @@ class mail_thread(osv.Model):
 
     def _get_message_ids(self, cr, uid, ids, name, args, context=None):
         res = {}
-        img_vote = "<img  class='oe_mail_vote_image'  src='/mail/static/src/img/vote.gif'/>"
         for id in ids:
             message_ids = self.message_search(cr, uid, [id], context=context)
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
-            vote_list = self.message_vote_ids(cr, uid, message_ids, context=context)
             res[id] = {
                 'message_ids': message_ids,
-                 'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span> <span> %s  %d</span>" % (len(message_ids), len(subscriber_ids), img_vote, len(vote_list)),
+                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
             }
         return res
 
@@ -102,13 +100,6 @@ class mail_thread(osv.Model):
     #------------------------------------------------------
     # Automatic subscription when creating/reading
     #------------------------------------------------------
-    def message_vote_ids(self, cr, uid, ids, context=None):
-        message_pool = self.pool.get('mail.message')
-        vote_list = []
-        for message in message_pool.browse(cr, uid, ids, context=context):
-            if message.vote_ids:
-                vote_list.append(message.vote_ids)
-        return vote_list
     
     def create(self, cr, uid, vals, context=None):
         """Automatically subscribe the creator """

From ea65cbb1e3ac1b919648c7b4cadb4f32dd7def10 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 13 Aug 2012 16:58:01 +0530
Subject: [PATCH 04/21] [FIX]: Remove get_vote_summary from mail message and
 search message id and user id from client side

bzr revid: atp@tinyerp.com-20120813112801-9f075ct8y73ide6m
---
 addons/mail/mail_message.py       | 31 +++++--------------------------
 addons/mail/static/src/js/mail.js | 28 ++++++++++++++++------------
 2 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1b5178e7271..d8256039359 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -242,41 +242,20 @@ class mail_message(osv.Model):
     #---------------------------------------------------
     #Mail Vote system (Like or Unlike comments
     #-----------------------------------------------------
-    
-    def get_vote_summary(self, cr, uid, ids, context=None):
-        '''
-        Return message ,count vote of message id given by .particular user with True or False.
-        '''
-        for message in self.browse(cr, uid, ids, context):
-            is_vote_liked = False
-            vote_count = len(message.vote_ids)
-            for vote in message.vote_ids:
-                if vote.user_id.id == uid:
-                    is_vote_liked = True
-                    break
-            res = {
-                'msg_id': message.id,
-                'vote_count': vote_count,
-                'is_vote_liked': is_vote_liked
-            }
-        return res
-    
     def vote_toggle(self, cr, uid, ids, context=None):
         '''
         Toggles when Comment is liked or unlike.
         Return the number of votes of particular message.
         '''
         vote_pool = self.pool.get('mail.vote')
-        vote_count = 0
+        new_vote_id = False
         for message in self.browse(cr, uid, ids, context):
-            voters_id = vote_pool.search(cr, uid, [('msg_id', '=', message.id), ('user_id', '=', uid)], context=context)
-            if not voters_id:
+            voters_ids = [x.id for x in message.vote_ids if x.user_id.id == uid]
+            if not voters_ids:
                 new_vote_id =  vote_pool.create(cr, uid, {'msg_id': message.id, 'user_id': uid}, context=context)
             else:
-                vote_pool.unlink(cr, uid, voters_id, context=context)
-            if message.vote_ids:
-                vote_count = len(message.vote_ids)    
-        return vote_count 
+                vote_pool.unlink(cr, uid, voters_ids, context=context)
+        return True
 
     #------------------------------------------------------
     # Email api
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8b60e96744c..38a3ab0d1bf 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -582,14 +582,20 @@ openerp.mail = function(session) {
 
         render_vote: function(message_id){
             var self = this;
-            this.mail_message = new session.web.DataSet(this, 'mail.message');
-            this.mail_message.call('get_vote_summary',[[parseInt(message_id)]]).then(function(result){
-                if (result){
-                    parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
-                    vote_element = session.web.qweb.render('VoteDisplay', result);
-                    $(parent_element).html(vote_element);
-                    self.add_vote_event($(parent_element));
-                }
+            var mail_vote = new session.web.DataSetSearch(self, 'mail.vote', self.session.context, [['msg_id','=',parseInt(message_id)]]);
+            mail_vote.read_slice(['user_id']).then(function(result){
+                vote_count = result.length;
+                is_vote_liked = false;
+                _.each(result, function(vote){
+                    if (self.session.uid == vote.user_id[0]){
+                        is_vote_liked = true;
+                        }
+                });
+                parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
+                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'is_vote_liked': is_vote_liked});
+                $(parent_element).html(vote_element);
+                self.add_vote_event($(parent_element));
+              
             });
         },
         
@@ -739,10 +745,6 @@ openerp.mail = function(session) {
         
         display_comments: function (records) {
             var self = this;
-            //Render Vote.
-            _.each(records, function(record){
-                self.render_vote(record.id);
-            });
             // sort the records
             mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
             //build attachments download urls and compute time-relative from dates
@@ -756,6 +758,8 @@ openerp.mail = function(session) {
                 }
             }
             _(records).each(function (record) {
+                //Render Votes.
+                 self.render_vote(record.id);
                 var sub_msgs = [];
                 if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
                     var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];

From 0b99488c3560f82e876cdbd7166eea72ffdec44e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 13 Aug 2012 17:03:51 +0530
Subject: [PATCH 05/21] [FIX]: Fix doc string in vote_toggle method

bzr revid: atp@tinyerp.com-20120813113351-cl09uvu4pqgvmbb4
---
 addons/mail/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d8256039359..587c7485d19 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -245,7 +245,7 @@ class mail_message(osv.Model):
     def vote_toggle(self, cr, uid, ids, context=None):
         '''
         Toggles when Comment is liked or unlike.
-        Return the number of votes of particular message.
+        create vote entries if current user like comment..
         '''
         vote_pool = self.pool.get('mail.vote')
         new_vote_id = False

From 7781f9cc974420f0dada6483fe356db62e6ac081 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 13 Aug 2012 17:19:19 +0530
Subject: [PATCH 06/21] [FIX]: Fix indentation and remove extra space

bzr revid: atp@tinyerp.com-20120813114919-7moebenujr9f9pf6
---
 addons/mail/static/src/js/mail.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 38a3ab0d1bf..2923f723952 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -561,8 +561,8 @@ openerp.mail = function(session) {
 
         //Mail vote Functionality...
         add_vote_event: function(element){
-            vote_img = element.find('.oe_mail_msg_vote_like');
             self = this;
+            vote_img = element.find('.oe_mail_msg_vote_like');
             if (vote_img)
                 vote_img.click(function(){
                     self.subscribe_vote($(this).attr('data-id'));
@@ -589,13 +589,12 @@ openerp.mail = function(session) {
                 _.each(result, function(vote){
                     if (self.session.uid == vote.user_id[0]){
                         is_vote_liked = true;
-                        }
+                    }
                 });
                 parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
                 vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'is_vote_liked': is_vote_liked});
                 $(parent_element).html(vote_element);
                 self.add_vote_event($(parent_element));
-              
             });
         },
         
@@ -603,7 +602,7 @@ openerp.mail = function(session) {
             var self = this;
             this.mail_message = new session.web.DataSet(this, 'mail.message');
             return this.mail_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
-                    self.render_vote(message_id);
+                self.render_vote(message_id);
             });
         },
          

From 1d2168a02ebeeb7441c9171bd9dcda8226d29cdc Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 14 Aug 2012 11:42:51 +0530
Subject: [PATCH 07/21] [FIX]: Set vote red button alignment.

bzr revid: atp@tinyerp.com-20120814061251-em6ipxuvvay8ei2p
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bd18d78e41d..bf29ada9f63 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -130,7 +130,7 @@
             </button>
         </t>
         <t t-if="is_vote_liked">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:2px">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
                 <span>-1</span>
             </button>
         </t>

From cbb41e6ed35e86ae0eb5b570aab26378903f47d8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 16 Aug 2012 12:10:26 +0530
Subject: [PATCH 08/21] [FIX]: Remove mail_subscription

bzr revid: atp@tinyerp.com-20120816064026-f3egkm1h2ximajzm
---
 addons/mail/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 2669eb9f269..c144c5a66bd 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -24,7 +24,6 @@ import mail_message
 import mail_followers
 import mail_thread
 import mail_group
-import mail_subscription
 import mail_vote
 import ir_needaction
 import res_partner

From e82782e1f6baab9471995dfa0db5dac13528abd2 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 7 Sep 2012 17:40:28 +0530
Subject: [PATCH 09/21] [FIX]: replace vote_user_ids inplace  of vote_ids.
 write or update vote_ids

bzr revid: atp@tinyerp.com-20120907121028-oyklpcccxb0ewv21
---
 addons/mail/mail_message.py         | 19 ++++++++++++++-----
 addons/mail/static/src/js/mail.js   | 21 +++++++++------------
 addons/mail/static/src/xml/mail.xml |  4 ++--
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 652c95d1b05..1a2cd1881ed 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -124,7 +124,7 @@ class mail_message(osv.Model):
         'unread': fields.function(_get_unread, fnct_search=_search_unread,
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
-        'vote_ids': fields.one2many('mail.vote', 'msg_id', 'Votes'),            
+        'vote_user_ids': fields.many2many('mail.vote', 'message_vote_rel', 'message_id', 'vote_id', 'Votes'),
 
     }
 
@@ -154,13 +154,14 @@ class mail_message(osv.Model):
         vote_pool = self.pool.get('mail.vote')
         new_vote_id = False
         for message in self.browse(cr, uid, ids, context):
-            voters_ids = [x.id for x in message.vote_ids if x.user_id.id == uid]
+            voters_ids = [x.id for x in message.vote_user_ids if x.user_id.id == uid]
             if not voters_ids:
                 new_vote_id =  vote_pool.create(cr, uid, {'msg_id': message.id, 'user_id': uid}, context=context)
-            else:    
+                self.write(cr, uid, ids, {'vote_user_ids': [(4, new_vote_id)]}, context=context)
+            else:
+                self.write(cr, uid, ids, {'vote_user_ids': [(3, voters_ids[0])]}, context=context)
                 vote_pool.unlink(cr, uid, voters_ids, context=context)
-        return True                
-
+        return True
 
     #------------------------------------------------------
     # Message loading for web interface
@@ -168,7 +169,13 @@ class mail_message(osv.Model):
 
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
+        vote_pool = self.pool.get('mail.vote')
         attachment_ids = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
+        vote_ids = vote_pool.name_get(cr, uid, [x.id for x in msg.vote_user_ids], context=context)
+        has_voted = False;
+        for vote in msg.vote_user_ids:
+            if (uid == vote.user_id.id):
+              has_voted = True;
         author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
         author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
@@ -186,6 +193,8 @@ class mail_message(osv.Model):
             'author_user_id': author_user_id,
             'partner_ids': partner_ids,
             'child_ids': [],
+            'vote_user_ids': vote_ids,
+            'has_voted': has_voted
         }
 
     def message_read_tree_flatten(self, cr, uid, messages, current_level, level, context=None):
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e902451ee1b..026808f8905 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -289,19 +289,16 @@ openerp.mail = function(session) {
 
         render_vote: function(message_id){
             var self = this;
-            var mail_vote = new session.web.DataSetSearch(self, 'mail.vote', self.session.context, [['msg_id','=',parseInt(message_id)]]);
-            mail_vote.read_slice(['user_id']).then(function(result){
-                vote_count = result.length;
-                is_vote_liked = false;
-                _.each(result, function(vote){
-                    if (self.session.uid == vote.user_id[0]){
-                        is_vote_liked = true;
-                    }
-                });
+            this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
+                vote_count = 0;
+                if (result[0].vote_user_ids){length
+                	vote_count = result[0].vote_user_ids.length;
+                }
                 parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
-                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'is_vote_liked': is_vote_liked});
+                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'has_voted': result[0].has_voted});
                 $(parent_element).html(vote_element);
                 self.add_vote_event($(parent_element));
+                
             });
         },
         
@@ -446,8 +443,6 @@ openerp.mail = function(session) {
             var self = this;
             var _expendable = false;
             _(records).each(function (record) {
-                //Render Votes.
-                self.render_vote(record.id);
                 if (record.type == 'expandable') {
                     _expendable = true;
                     self.update_fetch_more(true);
@@ -484,6 +479,8 @@ openerp.mail = function(session) {
          * - record.is_author: is the current user the author of the record */
         display_record: function (record) {
             // formatting and additional fields
+            //Render Votes.
+            this.render_vote(record.id);
             record.date = session.web.format_value(record.date, {type:"datetime"});
             record.timerelative = $.timeago(record.date);
             if (record.type == 'email') {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 2cab9825946..3b3a5d2de9e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -98,12 +98,12 @@
              <span class="oe_left oe_mail_vote_string">Votes :<t t-esc="vote_count"/></span>
         </t>
         <li>
-        <t t-if="!is_vote_liked">
+        <t t-if="!has_voted">
             <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Vote.">
                 <span>+1</span>
             </button>
         </t>
-        <t t-if="is_vote_liked">
+        <t t-if="has_voted">
             <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
                 <span>-1</span>
             </button>

From 56f7b22cc02f2eb6dbf34ade58aab5472e9ad5fb Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 7 Sep 2012 17:59:36 +0530
Subject: [PATCH 10/21] [REM]: Remove unused length

bzr revid: atp@tinyerp.com-20120907122936-tyk4kdapozh8ed0n
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 026808f8905..750df7aed41 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -291,7 +291,7 @@ openerp.mail = function(session) {
             var self = this;
             this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
                 vote_count = 0;
-                if (result[0].vote_user_ids){length
+                if (result[0].vote_user_ids){
                 	vote_count = result[0].vote_user_ids.length;
                 }
                 parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);

From 8e976060ee97de27dd7eacca4644686df6ed78c2 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 11 Sep 2012 12:31:45 +0530
Subject: [PATCH 11/21] [IMP]: iterate for result instead of result[0]

bzr revid: atp@tinyerp.com-20120911070145-bkj5y3redpxyfvu3
---
 addons/mail/static/src/js/mail.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a957a1386f8..db0099ca33e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -291,14 +291,15 @@ openerp.mail = function(session) {
             var self = this;
             this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
                 vote_count = 0;
-                if (result[0].vote_user_ids){
-                	vote_count = result[0].vote_user_ids.length;
-                }
-                parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
-                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'has_voted': result[0].has_voted});
-                $(parent_element).html(vote_element);
-                self.add_vote_event($(parent_element));
-                
+                _.each(result, function(res){
+	                if (res.vote_user_ids){
+	                	vote_count = res.vote_user_ids.length;
+	                }
+	                parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
+	                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'has_voted': res.has_voted});
+	                $(parent_element).html(vote_element);
+	                self.add_vote_event($(parent_element));
+	            });
             });
         },
         

From 2b8e7613a0b2031fca358312e349b3cc63965106 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 12 Sep 2012 18:26:23 +0530
Subject: [PATCH 12/21] [IMP] reduce the call when rendering vote, do the
 related changes in py, and improve the code for js and py

bzr revid: nco@tinyerp.com-20120912125623-ffrhgf84ttosjx44
---
 addons/mail/mail_message.py         | 25 ++++++++++++------------
 addons/mail/mail_vote.py            |  2 +-
 addons/mail/static/src/js/mail.js   | 30 +++++++++++++----------------
 addons/mail/static/src/xml/mail.xml |  4 ++--
 4 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1a2cd1881ed..86bbb405b9c 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -124,7 +124,7 @@ class mail_message(osv.Model):
         'unread': fields.function(_get_unread, fnct_search=_search_unread,
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
-        'vote_user_ids': fields.many2many('mail.vote', 'message_vote_rel', 'message_id', 'vote_id', 'Votes'),
+        'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', 'Votes'),
 
     }
 
@@ -146,21 +146,20 @@ class mail_message(osv.Model):
     #---------------------------------------------------
     #Mail Vote system (Like or Unlike comments
     #-----------------------------------------------------
-    def vote_toggle(self, cr, uid, ids, context=None):
+    def vote_toggle(self, cr, uid, ids, user_ids=None, context=None):
         '''
         Toggles when Comment is liked or unlike.
         create vote entries if current user like comment..
         '''
+        if not user_ids: user_ids = [uid]
         vote_pool = self.pool.get('mail.vote')
-        new_vote_id = False
+        
         for message in self.browse(cr, uid, ids, context):
-            voters_ids = [x.id for x in message.vote_user_ids if x.user_id.id == uid]
+            voters_ids = [x.id for x in message.vote_user_ids if x.id == uid]
             if not voters_ids:
-                new_vote_id =  vote_pool.create(cr, uid, {'msg_id': message.id, 'user_id': uid}, context=context)
-                self.write(cr, uid, ids, {'vote_user_ids': [(4, new_vote_id)]}, context=context)
+                self.write(cr, uid, ids, {'vote_user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
             else:
-                self.write(cr, uid, ids, {'vote_user_ids': [(3, voters_ids[0])]}, context=context)
-                vote_pool.unlink(cr, uid, voters_ids, context=context)
+                self.write(cr, uid, ids, {'vote_user_ids': [(3, uid)]}, context=context)
         return True
 
     #------------------------------------------------------
@@ -170,12 +169,14 @@ class mail_message(osv.Model):
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
         vote_pool = self.pool.get('mail.vote')
+        has_voted = False;
+        vote_ids = []
         attachment_ids = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
         vote_ids = vote_pool.name_get(cr, uid, [x.id for x in msg.vote_user_ids], context=context)
-        has_voted = False;
-        for vote in msg.vote_user_ids:
-            if (uid == vote.user_id.id):
-              has_voted = True;
+        if msg.vote_user_ids:
+            for user_id in msg.vote_user_ids:
+                if (uid == user_id.id):
+                    has_voted = True;
         author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
         author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
index 5d63de80864..81ca4e4e75e 100644
--- a/addons/mail/mail_vote.py
+++ b/addons/mail/mail_vote.py
@@ -30,7 +30,7 @@ class mail_vote(osv.Model):
     _name = 'mail.vote'
     _description = 'Mail Vote'
     _columns = {
-            'msg_id': fields.many2one('mail.message', 'Message', required=True),
+            'message_id': fields.many2one('mail.message', 'Message', required=True),
             'user_id': fields.many2one('res.users', 'User', required=True),
         }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index c5d4119881c..7ede8bdc7e3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -272,7 +272,7 @@ openerp.mail = function(session) {
                 });
             return
         },
-        
+
         find_parent_element: function(name, message_id){
             parent_element = false;
             _.each($(name), function(element){
@@ -283,27 +283,22 @@ openerp.mail = function(session) {
             return parent_element;
          },
 
-        render_vote: function(message_id){
+        render_vote: function(record){
+            vote_element = session.web.qweb.render('VoteDisplay', {});
+            var message_id = record.id
             var self = this;
-            this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
-                vote_count = 0;
-                _.each(result, function(res){
-	                if (res.vote_user_ids){
-	                	vote_count = res.vote_user_ids.length;
-	                }
-	                parent_element = self.find_parent_element(".oe_mail_msg_vote", message_id);
-	                vote_element = session.web.qweb.render('VoteDisplay', {'msg_id': message_id, 'vote_count': vote_count, 'has_voted': res.has_voted});
-	                $(parent_element).html(vote_element);
-	                self.add_vote_event($(parent_element));
-	            });
-            });
+            var to_render_element = false;
+            vote_element = session.web.qweb.render('VoteDisplay', {'message_id': message_id, 'vote_count': record.vote_user_ids.length, 'has_voted': record.has_voted});
+            parent_element = self.find_parent_element(".oe_mail_msg_vote",message_id);
+            $(parent_element).html(vote_element);
+            self.add_vote_event($(parent_element));
         },
         
         subscribe_vote: function(message_id){
             var self = this;
             this.mail_message = new session.web.DataSet(this, 'mail.message');
             return this.mail_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
-                self.render_vote(message_id);
+                //self.render_vote(message_id);
             });
         },
 
@@ -481,8 +476,6 @@ openerp.mail = function(session) {
          * - record.is_author: is the current user the author of the record */
         display_record: function (record) {
             // formatting and additional fields
-            //Render Votes.
-            this.render_vote(record.id);
             record.date = session.web.format_value(record.date, {type:"datetime"});
             record.timerelative = $.timeago(record.date);
             if (record.type == 'email') {
@@ -509,6 +502,9 @@ openerp.mail = function(session) {
                 moreClass: 'oe_mail_expand',
                 lessClass: 'oe_mail_reduce',
                 });
+            
+            //Render Votes.
+            this.render_vote(record);
         },
 
         /** Display 'show more' button */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cd17838dadf..696d52e1766 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -99,12 +99,12 @@
         </t>
         <li>
         <t t-if="!has_voted">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Vote.">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="message_id" title="Click to Vote.">
                 <span>+1</span>
             </button>
         </t>
         <t t-if="has_voted">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="msg_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
+            <button class="oe_mail_msg_vote_like" t-att-data-id="message_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
                 <span>-1</span>
             </button>
         </t>

From 553c04b260e63cadbffbd7391b4f5ec7417710a4 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 12 Sep 2012 18:29:55 +0530
Subject: [PATCH 13/21] [REMOVE] remove unused variable.

bzr revid: nco@tinyerp.com-20120912125955-djn6ivs3vtkrw49n
---
 addons/mail/static/src/js/mail.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7ede8bdc7e3..ff0dfaa01b8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -285,9 +285,8 @@ openerp.mail = function(session) {
 
         render_vote: function(record){
             vote_element = session.web.qweb.render('VoteDisplay', {});
-            var message_id = record.id
             var self = this;
-            var to_render_element = false;
+            var message_id = record.id
             vote_element = session.web.qweb.render('VoteDisplay', {'message_id': message_id, 'vote_count': record.vote_user_ids.length, 'has_voted': record.has_voted});
             parent_element = self.find_parent_element(".oe_mail_msg_vote",message_id);
             $(parent_element).html(vote_element);

From 951b6653cd58832ad2f546f05168c4da89c24ff7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Wed, 12 Sep 2012 18:45:51 +0530
Subject: [PATCH 14/21] [ADD] add function to fatch the new vote and render it.

bzr revid: nco@tinyerp.com-20120912131551-xzz16f5zuz3mlz6r
---
 addons/mail/static/src/js/mail.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ff0dfaa01b8..084c1001be7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -292,12 +292,17 @@ openerp.mail = function(session) {
             $(parent_element).html(vote_element);
             self.add_vote_event($(parent_element));
         },
-        
+        fetch_voters: function (message_id) {
+            var self= this
+            this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(result){
+                self.render_vote(result[0]);
+            });
+        },
         subscribe_vote: function(message_id){
             var self = this;
             this.mail_message = new session.web.DataSet(this, 'mail.message');
             return this.mail_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
-                //self.render_vote(message_id);
+                self.fetch_voters(message_id);
             });
         },
 

From cd7bf7b2d248a4f744c38b03fb8d5d22318e1e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 14:21:39 +0200
Subject: [PATCH 15/21] [CLEAN] mail: vote backend: cleaned code.

bzr revid: tde@openerp.com-20120918122139-543zxiuxytdzlqtk
---
 addons/mail/mail_message.py | 35 ++++++++++++++++++-----------------
 addons/mail/mail_thread.py  |  2 +-
 addons/mail/mail_vote.py    | 19 +++++++++++--------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 42553decb1f..4b7c0c645e3 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -131,7 +131,6 @@ class mail_message(osv.Model):
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
         'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', 'Votes'),
-
     }
 
     def _needaction_domain_get(self, cr, uid, context=None):
@@ -148,23 +147,25 @@ class mail_message(osv.Model):
         'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
         'body': '',
     }
-    
-    #---------------------------------------------------
-    #Mail Vote system (Like or Unlike comments
-    #-----------------------------------------------------
+
+    #------------------------------------------------------
+    # Vote/Like
+    #------------------------------------------------------
+
     def vote_toggle(self, cr, uid, ids, user_ids=None, context=None):
         '''
         Toggles when Comment is liked or unlike.
         create vote entries if current user like comment..
         '''
-        vote_pool = self.pool.get('mail.vote')
-        if not user_ids: user_ids = [uid]
-        for message in self.browse(cr, uid, ids, context):
-            voters_ids = [user.id for user in message.vote_user_ids if user.id == uid]
-            if not voters_ids:
-                self.write(cr, uid, ids, {'vote_user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
-            else:
-                self.write(cr, uid, ids, {'vote_user_ids': [(3, user_id) for user_id in user_ids]}, context=context)
+        if not user_ids:
+            user_ids = [uid]
+        for message in self.read(cr, uid, ids, ['vote_user_ids'], context=context):
+            for user_id in user_ids:
+                has_voted = user_id in message['vote_user_ids']
+                if not has_voted:
+                    self.write(cr, uid, ids, {'vote_user_ids': [(4, user_id)]}, context=context)
+                else:
+                    self.write(cr, uid, ids, {'vote_user_ids': [(3, user_id)]}, context=context)
         return True
 
     #------------------------------------------------------
@@ -174,12 +175,12 @@ class mail_message(osv.Model):
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
         vote_pool = self.pool.get('mail.vote')
-        has_voted = False;
-        vote_ids = []
-        vote_ids = vote_pool.name_get(cr, uid, [user.id for user in msg.vote_user_ids], context=context)
+        has_voted = False
+        vote_ids = self.pool.get('res.users').name_get(cr, uid, [user.id for user in msg.vote_user_ids], context=context)
         for user_id in msg.vote_user_ids:
             if (user_id.id == uid):
-                has_voted = True;
+                has_voted = True
+                break
         attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)]
         author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
         author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d45637ff56f..abee20a35f8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -176,7 +176,7 @@ class mail_thread(osv.AbstractModel):
     #------------------------------------------------------
     # Automatic subscription when creating
     #------------------------------------------------------
-    
+
     def create(self, cr, uid, vals, context=None):
         """ Override to subscribe the current user. """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
index 81ca4e4e75e..3d69734f198 100644
--- a/addons/mail/mail_vote.py
+++ b/addons/mail/mail_vote.py
@@ -20,17 +20,20 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
+
 
 class mail_vote(osv.Model):
-    '''
-    Mail vote feature allow users to like and unlike particular  message or Document's message comment.
-    It counts the number of votes per document.
-    '''
+    ''' Mail vote feature allow users to like and unlike messages attached
+        to a document. This allows for example to build a ranking-based
+        displaying of messages, for FAQ. '''
+
     _name = 'mail.vote'
     _description = 'Mail Vote'
     _columns = {
-            'message_id': fields.many2one('mail.message', 'Message', required=True),
-            'user_id': fields.many2one('res.users', 'User', required=True),
+            'message_id': fields.many2one('mail.message', 'Message', required=True,
+                select=1),
+            'user_id': fields.many2one('res.users', 'User', required=True,
+                select=1),
         }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 20eee8405a2d8f272f5174c4af1c580cbc4741bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 14:22:12 +0200
Subject: [PATCH 16/21] [IMP] mail: vote: cleaned security rights, available
 for everybody. Will need to be fixed.

bzr revid: tde@openerp.com-20120918122212-vr4h1eo7z9ew02q3
---
 addons/mail/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 1b6db48cb74..2ec74086a34 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -10,4 +10,4 @@ access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
 access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
 access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0
 access_mail_mail_manager,mail.mail,model_mail_mail,group_mail_manager,1,1,1,1
-access_mail_vote,mail.vote,model_mail_vote,base.group_user,1,1,1,1
+access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1

From 76d1e4dad506ebf09b1deaf0b144dc31a943b47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 14:23:15 +0200
Subject: [PATCH 17/21] [CLEAN] mail: vote: cleaned frond-end. Improved XML of
 vote template; this template is now directly called when rendering the
 message. Re-binded the vote event, cleaned function called on voting and
 rendering system. Added a records var on thread, holding the message values.
 Cleaned CSS.

bzr revid: tde@openerp.com-20120918122315-t41hgufdz71qil1z
---
 addons/mail/static/src/css/mail.css | 18 +++---
 addons/mail/static/src/js/mail.js   | 85 +++++++++++------------------
 addons/mail/static/src/xml/mail.xml | 38 +++++--------
 3 files changed, 54 insertions(+), 87 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d0e706191f7..2f9b35f1c95 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -261,15 +261,10 @@
 }
 
 /*--------------------------------------------------------------*/
-/* Mail Vote System (Like or Unlike Comment)
+/* mail.vote
 /*--------------------------------------------------------------*/
 
-.oe_mail_vote_image{
-    height='12px';
-    width='16px';	
-}
-
-button.oe_mail_msg_vote_like{
+.openerp .oe_mail_msg_content button.oe_mail_msg_vote {
     height:21px;
     width: 30px;
     padding: 1px;
@@ -277,18 +272,19 @@ button.oe_mail_msg_vote_like{
     margin-top: -4px;
 }
 
-button.oe_mail_msg_vote_like:hover{
-    background: #8A89BA;
+.openerp .oe_mail_msg_content button.oe_mail_msg_vote_true {
+    background:#DC5F59;
 }
 
-button.oe_mail_msg_vote_like span {
+.openerp .oe_mail_msg_content button.oe_mail_msg_vote span {
     color: white;
 }
 
-span.oe_mail_vote_string{
+.openerp .oe_mail_msg_content span.oe_mail_vote_count{
     color: #807FB4;
 }
 
+
 /* ------------------------------------------------------------ */
 /* mail.compose.message form view & OpenERP hacks
 /* ------------------------------------------------------------ */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 9cb107ca338..2f5f95fbb62 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -291,6 +291,7 @@ openerp.mail = function(session) {
                 truncate_limit: options.truncate_limit || 250,
             }
             // datasets and internal vars
+            this.records = {};
             this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model);
             this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
@@ -309,56 +310,6 @@ openerp.mail = function(session) {
             return display_done && compose_done;
         },
 
-        //Mail vote Functionality...
-        add_vote_event: function(element){
-            self = this;
-            vote_button = element.find('.oe_mail_msg_vote_like');
-            if (vote_button)
-            	vote_button.click(function(){
-                    self.subscribe_vote($(this).attr('data-id'));
-                });
-            return
-        },
-
-       // Fetch Records using updated message_id
-        
-        fetch_voters: function (message_id) {
-            var self= this
-            this.ds_message.call('message_read', [[parseInt(message_id)]]).then(function(results){
-            	_.each(results, function(result){
-            		self.render_vote(result);
-            	});
-            });
-        },
-        // Like and unlike..
-        subscribe_vote: function(message_id){
-            var self = this;
-            return this.ds_message.call('vote_toggle', [[parseInt(message_id)]]).then(function(result){
-                self.fetch_voters(message_id);
-            });
-        },
-        // Find parent element using current message id.
-        
-        find_parent_element: function(elements, message_id){
-            parent_element = false;
-            _.each($(elements), function(element){
-                if ($(element).attr("data-id") == message_id){
-                    parent_element = element;
-                }
-            });
-            return parent_element;
-         },
-
-        // Render vote Display template.
-        render_vote: function(record){
-        	var self = this;
-            vote_element = session.web.qweb.render('VoteDisplay', {});
-            // Get all element from record..
-            vote_element = session.web.qweb.render('VoteDisplay', {'message_id': record.id, 'vote_count': record.vote_user_ids.length, 'has_voted': record.has_voted});
-            parent_element = self.find_parent_element(".oe_mail_msg_vote", record.id);
-            $(parent_element).html(vote_element).appendTo(this.add_vote_event($(parent_element)));
-        },
-
         /** Customize the display
          * - show_header_compose: show the composition form in the header */
         do_customize_display: function() {
@@ -405,6 +356,8 @@ openerp.mail = function(session) {
                     'default_parent_id': parseInt(msg_id),
                     'default_content_subtype': 'html'} );
             });
+            // event: click on 'Vote' button
+            this.$el.on('click', 'button.oe_mail_msg_vote', this.on_vote);
         },
 
         on_message_delete: function (event) {
@@ -423,6 +376,16 @@ openerp.mail = function(session) {
             return this.ds_notification.call('set_message_read', [parseInt(msg_id)]);
         },
 
+        on_vote: function (event) {
+            event.stopPropagation();
+            var self = this;
+            var message_id = $(event.srcElement).parent().data().msg_id;
+            var vote_node = $(event.srcElement).parents('li').eq(0);
+            if (! message_id) { return false; }
+            return this.ds_message.call('vote_toggle', [[parseInt(message_id)]]).pipe(
+                self.toggle_vote(message_id, vote_node));
+        },
+
         /**
          * Override-hack of do_action: automatically reload the chatter.
          * Normally it should be called only when clicking on 'Post/Send'
@@ -542,6 +505,8 @@ openerp.mail = function(session) {
                 attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
             }
             record.is_author = mail.ChatterUtils.is_author(this, record.author_user_id[0]);
+            // add to internal storage
+            this.records[record.id] = record;
             // render, add the expand feature
             var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'options': this.options});
             $(rendered).appendTo(this.$el.children('div.oe_mail_thread_display:first'));
@@ -553,9 +518,23 @@ openerp.mail = function(session) {
                 moreClass: 'oe_mail_expand',
                 lessClass: 'oe_mail_reduce',
                 });
-            
-            //Render Votes.
-            this.render_vote(record);
+        },
+
+        // Render vote Display template.
+        toggle_vote: function (message_id, vote_node) {
+            var self = this;
+            var record = this.records[message_id];
+            if (record.has_voted) {
+                var idx = _.map(record.vote_user_ids, function (x) { return x[0]; }).indexOf(message_id);
+                record.vote_user_ids.splice(idx, 1);
+            }
+            else {
+                record.vote_user_ids.push([this.session.uid, 'Current user']);
+            }
+            record.has_voted = ! record.has_voted;
+            var vote_element = session.web.qweb.render('mail.thread.message.vote', {'record': record});
+            vote_node.empty();
+            vote_node.html(vote_element);
         },
 
         /** Display 'show more' button */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 088edee0f64..a09641e1992 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -106,25 +106,6 @@
         </div>
     </ul>
 
-    <!-- Vote system (Like or Unlike -->
-    <t t-name="VoteDisplay">
-        <t t-if='vote_count'>
-             <span class="oe_left oe_mail_vote_string">Votes :<t t-esc="vote_count"/></span>
-        </t>
-        <li>
-        <t t-if="!has_voted">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="message_id" title="Click to Vote.">
-                <span>+1</span>
-            </button>
-        </t>
-        <t t-if="has_voted">
-            <button class="oe_mail_msg_vote_like" t-att-data-id="message_id" title="Click to Unvote." style="background:#DC5F59; padding:1px">
-                <span>-1</span>
-            </button>
-        </t>
-        </li>
-    </t>
-
     <!-- default layout -->
     <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type} oe_semantic_html_override">
@@ -161,12 +142,10 @@
                         </li>
                         <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
                         <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-                        <li> <span t-att-data-id="record.id" class="oe_mail_msg_vote"></span> </li>
+                        <t t-call="mail.thread.message.vote"/>
+                        <!-- <li><span t-att-data-id="record.id" class="oe_mail_msg_vote"></span></li> -->
                         <li t-if="options.show_reply"><a class="oe_mail_msg_reply">Reply</a></li>
                         <li t-if="options.show_reply_by_email"><a class="oe_mail_msg_reply_by_email" t-attf-data-msg_id="{record.id}">Reply</a></li>
-                        <!-- uncomment when merging vote
-                        <li><a href="#">Like</a></li>
-                        -->
                         <li t-if="record.attachment_ids.length > 0">
                             <a class="oe_mail_msg_view_attachments">
                                 <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
@@ -200,4 +179,17 @@
         </ul>
     </t>
 
+    <!-- mail.thread.message.vote
+        Template used to display Like/Unlike in a mail.message
+    -->
+    <li t-name="mail.thread.message.vote">
+        <t t-if='record.vote_user_ids.length > 0'>
+             <span class="oe_left oe_mail_vote_count"><t t-esc="record.vote_user_ids.length"/> votes</span>
+        </t>
+        <button t-attf-class="oe_mail_msg_vote oe_mail_msg_vote_#{record.has_voted}" t-attf-data-msg_id="{record.id}">
+            <t t-if="! record.has_voted"><span>+1</span></t>
+            <t t-if="record.has_voted"><span>-1</span></t>
+        </button>
+    </li>
+
 </template>

From 2ae49751eb9e97b4ec9820a07258f5d07a527d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 17:05:17 +0200
Subject: [PATCH 18/21] [TEST] mail: added tests for the vote feature.

bzr revid: tde@openerp.com-20120918150517-c08jw61c9fpasisc
---
 addons/mail/tests/test_mail.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 1fab5dd1732..57a59e2595f 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -647,3 +647,33 @@ class test_mail(TestMailMockups):
         msg1.refresh()
         self.assertEqual(5, len(group_pigs.message_ids), 'group should contain 5 messages')
         self.assertEqual(2, len(msg1.child_ids), 'msg1 should have 2 children now')
+
+    def test_60_vote(self):
+        """ Test designed for the vote/unvote feature. """
+        cr, uid = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        user_admin = self.res_users.browse(cr, uid, uid)
+        msg1 = group_pigs.message_post(body='My Body', subject='1')
+        msg1 = self.mail_message.browse(cr, uid, msg1)
+
+        # Create user Bert Tartopoils
+        user_bert_id = self.res_users.create(cr, uid, {'name': 'Bert', 'login': 'bert'})
+        user_bert = self.res_users.browse(cr, uid, user_bert_id)
+
+        # Test: msg1 and msg2 have void vote_user_ids
+        self.assertFalse(msg1.vote_user_ids, 'newly created message msg1 has not void vote_user_ids')
+        # Do: Admin vote for msg1
+        self.mail_message.vote_toggle(cr, uid, [msg1.id])
+        msg1.refresh()
+        # Test: msg1 has Admin as voter
+        self.assertEqual(set(msg1.vote_user_ids), set([user_admin]), 'after voting, Admin is not the voter')
+        # Do: Bert vote for msg1
+        self.mail_message.vote_toggle(cr, uid, [msg1.id], [user_bert_id])
+        msg1.refresh()
+        # Test: msg1 has Admin and Bert as voters
+        self.assertEqual(set(msg1.vote_user_ids), set([user_admin, user_bert]), 'after voting, Admin and Bert are not the voters')
+        # Do: Admin unvote for msg1
+        self.mail_message.vote_toggle(cr, uid, [msg1.id])
+        msg1.refresh()
+        # Test: msg1 has Bert as voter
+        self.assertEqual(set(msg1.vote_user_ids), set([user_bert]), 'after unvoting for Admin, Bert is not the voter')

From 21833581643ac28af36e778f479c0bdbcc461285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 18 Sep 2012 17:05:44 +0200
Subject: [PATCH 19/21] [CLEAN] mail: vote: cleaned before merging.

bzr revid: tde@openerp.com-20120918150544-2pgwh1mhi5yyqi22
---
 addons/mail/mail_message.py         |  19 ++++++++-----------
 addons/mail/mail_vote.py            |   8 ++++----
 addons/mail/static/src/img/vote.gif | Bin 892 -> 0 bytes
 addons/mail/static/src/js/mail.js   |   2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 addons/mail/static/src/img/vote.gif

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4b7c0c645e3..1d5d85e36e0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -130,7 +130,8 @@ class mail_message(osv.Model):
         'unread': fields.function(_get_unread, fnct_search=_search_unread,
             type='boolean', string='Unread',
             help='Functional field to search for unread messages linked to uid'),
-        'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', 'Votes'),
+        'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', string='Votes',
+            help='Users that voted for this message'),
     }
 
     def _needaction_domain_get(self, cr, uid, context=None):
@@ -153,19 +154,16 @@ class mail_message(osv.Model):
     #------------------------------------------------------
 
     def vote_toggle(self, cr, uid, ids, user_ids=None, context=None):
-        '''
-        Toggles when Comment is liked or unlike.
-        create vote entries if current user like comment..
-        '''
+        ''' Toggles voting '''
         if not user_ids:
             user_ids = [uid]
         for message in self.read(cr, uid, ids, ['vote_user_ids'], context=context):
             for user_id in user_ids:
-                has_voted = user_id in message['vote_user_ids']
+                has_voted = user_id in message.get('vote_user_ids')
                 if not has_voted:
-                    self.write(cr, uid, ids, {'vote_user_ids': [(4, user_id)]}, context=context)
+                    self.write(cr, uid, message.get('id'), {'vote_user_ids': [(4, user_id)]}, context=context)
                 else:
-                    self.write(cr, uid, ids, {'vote_user_ids': [(3, user_id)]}, context=context)
+                    self.write(cr, uid, message.get('id'), {'vote_user_ids': [(3, user_id)]}, context=context)
         return True
 
     #------------------------------------------------------
@@ -174,11 +172,10 @@ class mail_message(osv.Model):
 
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
-        vote_pool = self.pool.get('mail.vote')
         has_voted = False
         vote_ids = self.pool.get('res.users').name_get(cr, uid, [user.id for user in msg.vote_user_ids], context=context)
-        for user_id in msg.vote_user_ids:
-            if (user_id.id == uid):
+        for vote in vote_ids:
+            if vote[0] == uid:
                 has_voted = True
                 break
         attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)]
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
index 3d69734f198..1e439fe0aeb 100644
--- a/addons/mail/mail_vote.py
+++ b/addons/mail/mail_vote.py
@@ -30,10 +30,10 @@ class mail_vote(osv.Model):
     _name = 'mail.vote'
     _description = 'Mail Vote'
     _columns = {
-            'message_id': fields.many2one('mail.message', 'Message', required=True,
-                select=1),
-            'user_id': fields.many2one('res.users', 'User', required=True,
-                select=1),
+            'message_id': fields.many2one('mail.message', 'Message', select=1,
+                ondelete='cascade', required=True),
+            'user_id': fields.many2one('res.users', 'User', select=1,
+                ondelete='cascade', required=True),
         }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/static/src/img/vote.gif b/addons/mail/static/src/img/vote.gif
deleted file mode 100644
index 0e6b874770e1122b3f08f01d26bae9f08b94cfe6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 892
zcmZ?wbhEHb<Y(Yz_|5<VqN1Ym^75*xs@mGx*4Ebc_Vy7G5m{MT-QC>_7cRVe_wN7y
z|G^4JiO~=kZXuxflZBCi;Xi{8$YY>9!N3v8@Sju0!k~eniGy7zp};`#5CadBg-XW)
zha;V=k}f;~2O1ohWSp~PDnG_IFtaO6lF_`F(#WJ0K8@#t(X&(2OcGCB>Da7xoQcbW
V?}tRu!6p_1OTLJPi-`^l)&OE6GJpU8

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2f5f95fbb62..57c777441e7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -529,7 +529,7 @@ openerp.mail = function(session) {
                 record.vote_user_ids.splice(idx, 1);
             }
             else {
-                record.vote_user_ids.push([this.session.uid, 'Current user']);
+                record.vote_user_ids.push([this.session.uid, 'You']);
             }
             record.has_voted = ! record.has_voted;
             var vote_element = session.web.qweb.render('mail.thread.message.vote', {'record': record});

From d98d41d236a9f7124675c28b473b7df3f2127b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 18 Sep 2012 18:17:51 +0200
Subject: [PATCH 20/21] [FIX] css fixes for editable list

bzr revid: fva@openerp.com-20120918161751-fz73pig39zxm7hso
---
 addons/web/static/src/css/base.css           | 22 +++++++++++++-------
 addons/web/static/src/css/base.sass          | 18 +++++++++++++++-
 addons/web_kanban/static/src/css/kanban.css  |  4 ++--
 addons/web_kanban/static/src/css/kanban.sass |  4 ++--
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 16861a7853f..dab079aba7a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -25,7 +25,6 @@
     display: none !important;
   }
 }
-
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -41,7 +40,7 @@
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp :-moz-placeholder {
   color: #afafb6 !important;
@@ -1154,7 +1153,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1179,7 +1178,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -1521,6 +1520,7 @@
   font-size: 1px;
   letter-spacing: -1px;
   color: transparent;
+  font-weight: normal;
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
@@ -2001,6 +2001,8 @@
 .openerp .oe_form .oe_subtotal_footer .oe_subtotal_footer_separator {
   width: 108px;
   border-top: 1px solid #cacaca;
+  margin-top: 4px;
+  padding-top: 4px;
   font-weight: bold;
   font-size: 18px;
 }
@@ -2043,7 +2045,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -2638,20 +2640,24 @@
 }
 .openerp .oe_list_content td.oe_list_field_handle {
   width: 1em;
+  padding: 0 !important;
   cursor: ns-resize;
 }
 .openerp .oe_list_content td.oe_list_field_handle .oe_list_handle {
   font-size: 1px;
   letter-spacing: -1px;
   color: transparent;
+  font-weight: normal;
+  margin-right: 7px;
 }
 .openerp .oe_list_content td.oe_list_field_handle .oe_list_handle:before {
-  font: 21px "mnmliconsRegular";
-  content: "ö";
-  color: #404040;
+  font: 18px "entypoRegular";
+  content: "}";
+  color: #e0e0e0;
 }
 .openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle {
   display: none !important;
+  padding: 0 !important;
 }
 .openerp .oe_list_cannot_delete .oe_list_record_delete {
   display: none !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e3cb661d580..9d121457234 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -119,11 +119,22 @@ $sheet-max-width: 860px
     font-size: 1px
     letter-spacing: -1px
     color: transparent
+    font-weight: normal 
     &:before
         font: 21px "mnmliconsRegular"
         content: $icon-name
         color: $color
 
+@mixin text-to-entypo-icon($icon-name, $color: #404040, $size: 21px)
+    font-size: 1px
+    letter-spacing: -1px
+    color: transparent
+    font-weight: normal 
+    &:before
+        font: $size "entypoRegular"
+        content: $icon-name
+        color: $color
+
 // }}}
 
 @media print
@@ -1574,6 +1585,8 @@ $sheet-max-width: 860px
             .oe_subtotal_footer_separator
                 width: 108px
                 border-top: 1px solid #cacaca
+                margin-top: 4px
+                padding-top: 4px
                 font-weight: bold
                 font-size: 18px
             label:after
@@ -2068,13 +2081,16 @@ $sheet-max-width: 860px
             text-indent: -9001px
         td.oe_list_field_handle
             width: 1em
+            padding: 0 !important
             cursor: ns-resize
             .oe_list_handle
-                @include text-to-icon("ö")
+                @include text-to-entypo-icon("}",#E0E0E0,18px)
+                margin-right: 7px
 
     .oe_list_cannot_edit
         .oe_list_header_handle, .oe_list_field_handle
             display: none !important
+            padding: 0 !important
     .oe_list_cannot_delete
         .oe_list_record_delete
             display: none !important
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 48cf725ead3..6218d028576 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -346,8 +346,8 @@
   position: relative;
   display: block;
   background: white;
-  border: 1px solid #d8d8d8;
-  border-bottom-color: #b9b9b9;
+  border: 1px solid rgba(0, 0, 0, 0.16);
+  border-bottom-color: rgba(0, 0, 0, 0.3);
   padding: 8px;
   display: block;
   -moz-border-radius: 4px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 95a63dbd1a2..a45515efdd0 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -311,8 +311,8 @@
         position: relative
         display: block
         background: white
-        border: 1px solid #d8d8d8
-        border-bottom-color: #b9b9b9
+        border: 1px solid rgba(0,0,0,0.16)
+        border-bottom-color: rgba(0,0,0,0.3)
         padding: 8px
         display: block
         @include radius(4px)

From c730c3cb784868ad5515e0e707939919d1af7e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 18 Sep 2012 18:25:32 +0200
Subject: [PATCH 21/21] [FIX] css header alignment

bzr revid: fva@openerp.com-20120918162532-xte92rwm6jemy09f
---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index dab079aba7a..10ee9dea2de 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1957,6 +1957,9 @@
   background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
   background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
 }
+.openerp .oe_form header > span {
+  margin-left: 4px;
+}
 .openerp .oe_form header ul {
   display: inline-block;
   float: right;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 9d121457234..1aa4726725c 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1551,6 +1551,8 @@ $sheet-max-width: 860px
             border-bottom: 1px solid #cacaca
             padding-left: 2px
             @include vertical-gradient(#fcfcfc, #dedede)
+            > span
+                margin-left: 4px
             ul
                 display: inline-block
                 float: right