From 73cf8d29f9209c8adfcbed97248f6bcaaa220f41 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 5 Mar 2013 18:24:42 +0530
Subject: [IMP] Added EDIT button in message_followers template for editing the
 subtypes of the users.

bzr revid: psa@tinyerp.com-20130305125442-z8h470slga4d77ll
---
 addons/mail/static/src/css/mail.css           |  6 ++++++
 addons/mail/static/src/js/mail_followers.js   | 19 +++++++++++++++++++
 addons/mail/static/src/xml/mail_followers.xml |  1 +
 3 files changed, 26 insertions(+)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e4e112cdfaf..3ed2482911c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -617,6 +617,12 @@
     right: 0px;
     line-height: 20px;
 }
+.openerp .oe_followers .oe_edit_subtype{
+    cursor: pointer;
+    line-height: 26px;
+    position: absolute;
+    right: 12px;
+}
 
 .openerp .oe_followers .oe_show_more{
     cursor: pointer;
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 41634fd2135..ba776995d5b 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -74,10 +74,29 @@ openerp_mail_followers = function(session, mail) {
             this.$el.on('click', '.oe_subtype_list input', self.do_update_subscription);
             // event: click on 'invite' button, that opens the invite wizard
             this.$('.oe_invite').on('click', self.on_invite_follower);
+            this.$el.on('click', '.oe_edit_subtype', self.on_edit_subtype);
             this.$el.on('click', '.oe_remove_follower', self.on_remove_follower);
             this.$el.on('click', '.oe_show_more', self.on_show_more_followers)
         },
 
+        on_edit_subtype: function() {
+            var self = this;
+            var action = {
+                type: 'ir.actions.act_window',
+                res_model: 'mail.message.subtype',
+                domain: [['res_model','=', self.view.model]],
+                view_mode: 'list',
+                view_type: 'list',
+                views: [[false, 'list']],
+                target: 'new',
+            }
+            this.do_action(action, {
+                on_close: function() {
+                    self.read_value();
+                },
+            });
+        },
+
         on_invite_follower: function (event) {
             var self = this;
             var action = {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 459f13155a0..c22d253b1f7 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,6 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
+        <a t-if="widget.view_is_editable" class="oe_edit_subtype" title="Edit Subtype" t-att-data-id="record.id">Edit</a>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 7c5ddd2de0ead278c488fb380992a7a344b4c916 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 6 Mar 2013 16:48:54 +0530
Subject: [IMP]Placed edit image in place of edit link and improved css.

bzr revid: psa@tinyerp.com-20130306111854-d95kiof2o4apc8ns
---
 addons/mail/static/src/css/mail.css           |   4 +++-
 addons/mail/static/src/img/icon-edit.gif      | Bin 0 -> 129 bytes
 addons/mail/static/src/xml/mail_followers.xml |   2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 addons/mail/static/src/img/icon-edit.gif

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 3ed2482911c..8056c95ecb3 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -619,9 +619,11 @@
 }
 .openerp .oe_followers .oe_edit_subtype{
     cursor: pointer;
-    line-height: 26px;
     position: absolute;
     right: 12px;
+    margin-top: 6px;
+    width: 10px !important;
+    height: 12px !important;
 }
 
 .openerp .oe_followers .oe_show_more{
diff --git a/addons/mail/static/src/img/icon-edit.gif b/addons/mail/static/src/img/icon-edit.gif
new file mode 100644
index 00000000000..6e9aa5ef659
Binary files /dev/null and b/addons/mail/static/src/img/icon-edit.gif differ
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index c22d253b1f7..1e88deb7960 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <a t-if="widget.view_is_editable" class="oe_edit_subtype" title="Edit Subtype" t-att-data-id="record.id">Edit</a>
+        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 14317130c38bb254de5398c40847d293b9f51b32 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 8 Mar 2013 12:50:39 +0530
Subject: [IMP] added method for checking the group technical features is added
 or not.

bzr revid: psa@tinyerp.com-20130308072039-6iau8anuckonc6ps
---
 addons/mail/static/src/js/mail_followers.js   | 16 +++++++++++++++-
 addons/mail/static/src/xml/mail_followers.xml |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index ba776995d5b..5c6d3bc3347 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -31,6 +31,7 @@ openerp_mail_followers = function(session, mail) {
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
+            this.check_access = false;
 
             this.value = [];
             this.followers = [];
@@ -149,7 +150,20 @@ openerp_mail_followers = function(session, mail) {
             return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
                 .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
                 .then(this.proxy('display_buttons'))
-                .then(this.proxy('fetch_subtypes'));
+                .then(this.proxy('fetch_subtypes'))
+                .then(this.proxy('check_group_tech_feature'));
+        },
+
+        check_group_tech_feature: function(){
+            var self = this;
+            var edit_subtypes = new session.web.Model("res.groups");
+            edit_subtypes.query(["name","users"])
+                .filter([["name","=","Technical Features"], ["users","in",self.session.uid]]).first()
+                .then(function(res) {
+                if (res) {
+                    self.check_access = true;
+                    }
+                });
         },
 
         /** Read on res.partner failed: fall back on a generic case
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 1e88deb7960..18404c4ec05 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 0b62a6858f52a6d2e3edfaabdb64a71d2e0686fa Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 14 Mar 2013 15:59:49 +0530
Subject: [IMP] 1) Added code for opening the dialog box of edit followers, 2)
 Added an image in the mail.message.subtype template which is visible when the
 Technical Features menu is selected true . 3) On clicking on the edit pencil
 which is with the followers name gives the subtypes of the specific followers
 on which the user had clicked rather than the current form.

bzr revid: psa@tinyerp.com-20130314102949-4v9l6xpz5u1jeq10
---
 addons/mail/static/src/js/mail_followers.js   | 59 +++++++++++++++++++++++++--
 addons/mail/static/src/xml/mail_followers.xml |  3 +-
 2 files changed, 57 insertions(+), 5 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 5c6d3bc3347..031aeddb7d7 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -80,22 +80,72 @@ openerp_mail_followers = function(session, mail) {
             this.$el.on('click', '.oe_show_more', self.on_show_more_followers)
         },
 
-        on_edit_subtype: function() {
+        on_edit_subtype: function(event) {
             var self = this;
+            var records = [];
+            var partner_id = $(event.target).data('id');
+            var id = this.view.datarecord.id;
+            var res_model = this.view.dataset.model;
+            console.log('thissssssssssssssss>>', this, id, partner_id);
+            var $dialog = session.web.dialog($('<div>'), {
+                            modal: true,
+                            title: partner_id,
+                            buttons: [
+                                    {text: _t("Apply"), click: function() { 
+                                  //     self.apply_subtype(id, partner_id);
+                                       $(this).dialog("close");
+                                        }
+                                    },
+                                    {text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
+                                ],
+                    });
+            this.ds_model.call('edit_followers_subtype', [[id], [partner_id], new session.web.CompoundContext(this.build_context(), {})])
+                .then(function (data) {
+              //      console.log('then>>>>>', data, id, partner_id);
+                    if (data[id]) {
+                        records = data[id].message_subtype_data;
+                //        console.log('records........', records);
+                        }
+                        _(records).each(function (record, record_name) {
+                            record.name = record_name;
+                            record.followed = record.followed || undefined;
+                           console.log('record??????????????', record);
+                           $(session.web.qweb.render("mail.followers.subtype", {'record': record})).appendTo($dialog);
+                        });
+                });
+
+    /*        var partner_id = $(event.target).data('id');
+            var context = new session.web.CompoundContext(this.build_context(), {});
+
             var action = {
                 type: 'ir.actions.act_window',
-                res_model: 'mail.message.subtype',
+                res_model: 'mail.message.subtype', //'subtype.edit.wizard', 
                 domain: [['res_model','=', self.view.model]],
                 view_mode: 'list',
                 view_type: 'list',
                 views: [[false, 'list']],
                 target: 'new',
+                context: {
+                    'res_model': this.view.dataset.model,
+                    'res_id': this.view.datarecord.id,
+                    'partner_id': partner_id,
+                },
             }
+            
             this.do_action(action, {
                 on_close: function() {
                     self.read_value();
                 },
-            });
+            });*/
+
+        },
+        
+        apply_subtype: function(id, partner_id) {
+            console.log('id>>>partner_id>>> ', id, partner_id);
+            this.ds_model.call('apply_subtype', [[id], [partner_id], new session.web.CompoundContext(this.build_context(), {})])
+                .then(function (data) {
+                            console.log('dataaaaaaaaaaaaa', data);
+                });
         },
 
         on_invite_follower: function (event) {
@@ -154,7 +204,7 @@ openerp_mail_followers = function(session, mail) {
                 .then(this.proxy('check_group_tech_feature'));
         },
 
-        check_group_tech_feature: function(){
+        check_group_tech_feature: function() {
             var self = this;
             var edit_subtypes = new session.web.Model("res.groups");
             edit_subtypes.query(["name","users"])
@@ -276,6 +326,7 @@ openerp_mail_followers = function(session, mail) {
                 .then(this.proxy('read_value'));
 
             _.each(this.$('.oe_subtype_list input'), function (record) {
+                console.log('do follow>', record);
                 $(record).attr('checked', 'checked');
             });
         },
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 18404c4ec05..7721b1beb22 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,8 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <!--t t-js="ab">console.log(':::::::::::;', ab);</t-->
+        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From f242c87c7e182dbe011bedb74b0fbfdecf89336a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 14 Mar 2013 19:11:22 +0530
Subject: [IMP] Now partner name is displayed as per the record and  added a
 new template.

bzr revid: psa@tinyerp.com-20130314134122-gedt3b9eq5kolnlt
---
 addons/mail/static/src/js/mail_followers.js   | 7 +++----
 addons/mail/static/src/xml/mail_followers.xml | 9 +++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 031aeddb7d7..41f227b5881 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -84,12 +84,12 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             var records = [];
             var partner_id = $(event.target).data('id');
+            var partner_name = $(event.target).siblings('a').text(); 
             var id = this.view.datarecord.id;
             var res_model = this.view.dataset.model;
-            console.log('thissssssssssssssss>>', this, id, partner_id);
             var $dialog = session.web.dialog($('<div>'), {
                             modal: true,
-                            title: partner_id,
+                            title: _t('Edit Subtypes of ') + '"' + partner_name + '"',
                             buttons: [
                                     {text: _t("Apply"), click: function() { 
                                   //     self.apply_subtype(id, partner_id);
@@ -109,8 +109,7 @@ openerp_mail_followers = function(session, mail) {
                         _(records).each(function (record, record_name) {
                             record.name = record_name;
                             record.followed = record.followed || undefined;
-                           console.log('record??????????????', record);
-                           $(session.web.qweb.render("mail.followers.subtype", {'record': record})).appendTo($dialog);
+                           $(session.web.qweb.render("mail.followers.edit.subtype", {'record': record})).appendTo($dialog);
                         });
                 });
 
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 7721b1beb22..071205803bb 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -50,6 +50,15 @@
         </table>
     </t>
 
+    <t t-name="mail.followers.edit.subtype">
+        <table class='oe_subtype'>
+            <tr>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+            </tr>
+        </table>
+    </t>
+
     <t t-name="mail.followers.show_more">
         <div class="oe_partner oe_show_more">And <t t-raw="number"/> more.</div>
     </t>
-- 
cgit v1.2.3


From 90868a808903c8f5812a4243092a448752f25100 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 15 Mar 2013 14:22:45 +0530
Subject: [IMP] Add method for the apply button when the user click on the
 apply button of the dialog box the data will be updated Removed unwanted code
 and clean the code.

bzr revid: psa@tinyerp.com-20130315085245-uhefj63na5z62of5
---
 addons/mail/static/src/js/mail_followers.js   | 62 +++++++++------------------
 addons/mail/static/src/xml/mail_followers.xml |  5 +--
 2 files changed, 22 insertions(+), 45 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 41f227b5881..0eb864d02da 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -87,24 +87,21 @@ openerp_mail_followers = function(session, mail) {
             var partner_name = $(event.target).siblings('a').text(); 
             var id = this.view.datarecord.id;
             var res_model = this.view.dataset.model;
-            var $dialog = session.web.dialog($('<div>'), {
+            var $dialog = session.web.dialog($('<div class = "oe_edit_actions">'), {
                             modal: true,
                             title: _t('Edit Subtypes of ') + '"' + partner_name + '"',
                             buttons: [
-                                    {text: _t("Apply"), click: function() { 
-                                  //     self.apply_subtype(id, partner_id);
-                                       $(this).dialog("close");
-                                        }
-                                    },
-                                    {text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
+                                    { text: _t("Apply"), click: function() { 
+                                        self.on_apply_subtype(id, partner_id);
+                                        $(this).dialog("close");
+                                    }},
+                                    { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
                                 ],
                     });
-            this.ds_model.call('edit_followers_subtype', [[id], [partner_id], new session.web.CompoundContext(this.build_context(), {})])
+            this.ds_model.call('edit_followers_subtype', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
                 .then(function (data) {
-              //      console.log('then>>>>>', data, id, partner_id);
                     if (data[id]) {
                         records = data[id].message_subtype_data;
-                //        console.log('records........', records);
                         }
                         _(records).each(function (record, record_name) {
                             record.name = record_name;
@@ -112,39 +109,21 @@ openerp_mail_followers = function(session, mail) {
                            $(session.web.qweb.render("mail.followers.edit.subtype", {'record': record})).appendTo($dialog);
                         });
                 });
+        },
 
-    /*        var partner_id = $(event.target).data('id');
-            var context = new session.web.CompoundContext(this.build_context(), {});
-
-            var action = {
-                type: 'ir.actions.act_window',
-                res_model: 'mail.message.subtype', //'subtype.edit.wizard', 
-                domain: [['res_model','=', self.view.model]],
-                view_mode: 'list',
-                view_type: 'list',
-                views: [[false, 'list']],
-                target: 'new',
-                context: {
-                    'res_model': this.view.dataset.model,
-                    'res_id': this.view.datarecord.id,
-                    'partner_id': partner_id,
-                },
+        on_apply_subtype: function(id, partner_id) {
+            var checklist = new Array();
+            _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
+                if ($(record).is(':checked')) {
+                    checklist.push(parseInt($(record).data('id')));
+                }
+            });
+            if (!checklist.length) {
+                this.do_unfollow();
+            } else {
+                this.ds_model.call('apply_edited_subtypes', [[id], partner_id, checklist, new session.web.CompoundContext(this.build_context(), {})])
+                    .then(this.proxy('read_value'));
             }
-            
-            this.do_action(action, {
-                on_close: function() {
-                    self.read_value();
-                },
-            });*/
-
-        },
-        
-        apply_subtype: function(id, partner_id) {
-            console.log('id>>>partner_id>>> ', id, partner_id);
-            this.ds_model.call('apply_subtype', [[id], [partner_id], new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {
-                            console.log('dataaaaaaaaaaaaa', data);
-                });
         },
 
         on_invite_follower: function (event) {
@@ -325,7 +304,6 @@ openerp_mail_followers = function(session, mail) {
                 .then(this.proxy('read_value'));
 
             _.each(this.$('.oe_subtype_list input'), function (record) {
-                console.log('do follow>', record);
                 $(record).attr('checked', 'checked');
             });
         },
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 071205803bb..7a615044af1 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,8 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <!--t t-js="ab">console.log(':::::::::::;', ab);</t-->
-        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.uid === 1" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
@@ -53,7 +52,7 @@
     <t t-name="mail.followers.edit.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_edit_check"/></td>
                 <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
-- 
cgit v1.2.3


From b5df63291a0de2cbcd42a348db5ffa925f8e4efc Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 15 Mar 2013 18:01:57 +0530
Subject: [IMP] Removed the dialog box on apply and close to open a new dialog
 box everytime. Removed unwanted code.

bzr revid: psa@tinyerp.com-20130315123157-n0n3fdej014ysz7v
---
 addons/mail/static/src/js/mail_followers.js | 37 ++++++++++-------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 0eb864d02da..0bfcbfc29e9 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -31,7 +31,6 @@ openerp_mail_followers = function(session, mail) {
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
-            this.check_access = false;
 
             this.value = [];
             this.followers = [];
@@ -87,15 +86,15 @@ openerp_mail_followers = function(session, mail) {
             var partner_name = $(event.target).siblings('a').text(); 
             var id = this.view.datarecord.id;
             var res_model = this.view.dataset.model;
-            var $dialog = session.web.dialog($('<div class = "oe_edit_actions">'), {
+            var $dialog = new session.web.dialog($('<div class = "oe_edit_actions">'), {
                             modal: true,
                             title: _t('Edit Subtypes of ') + '"' + partner_name + '"',
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
                                         self.on_apply_subtype(id, partner_id);
-                                        $(this).dialog("close");
+                                        $dialog.remove();
                                     }},
-                                    { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
+                                    { text: _t("Cancel"), click: function() { $dialog.remove(); }}
                                 ],
                     });
             this.ds_model.call('edit_followers_subtype', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
@@ -112,16 +111,17 @@ openerp_mail_followers = function(session, mail) {
         },
 
         on_apply_subtype: function(id, partner_id) {
-            var checklist = new Array();
-            _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
-                if ($(record).is(':checked')) {
-                    checklist.push(parseInt($(record).data('id')));
-                }
+            var check_list = new Array();
+            _($('.oe_edit_actions input[type="checkbox"]')).each(function (records) {
+                 if ($(records).is(':checked')) {
+                     check_list.push(parseInt($(records).data('id')));
+                 }
             });
-            if (!checklist.length) {
+
+            if (!check_list.length) {
                 this.do_unfollow();
             } else {
-                this.ds_model.call('apply_edited_subtypes', [[id], partner_id, checklist, new session.web.CompoundContext(this.build_context(), {})])
+                return this.ds_model.call('apply_edited_subtypes', [[id], partner_id, check_list, new session.web.CompoundContext(this.build_context(), {})])
                     .then(this.proxy('read_value'));
             }
         },
@@ -178,20 +178,7 @@ openerp_mail_followers = function(session, mail) {
             return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
                 .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
                 .then(this.proxy('display_buttons'))
-                .then(this.proxy('fetch_subtypes'))
-                .then(this.proxy('check_group_tech_feature'));
-        },
-
-        check_group_tech_feature: function() {
-            var self = this;
-            var edit_subtypes = new session.web.Model("res.groups");
-            edit_subtypes.query(["name","users"])
-                .filter([["name","=","Technical Features"], ["users","in",self.session.uid]]).first()
-                .then(function(res) {
-                if (res) {
-                    self.check_access = true;
-                    }
-                });
+                .then(this.proxy('fetch_subtypes'));
         },
 
         /** Read on res.partner failed: fall back on a generic case
-- 
cgit v1.2.3


From 0abe605544641bb0788f6b84f8df76603dd90b93 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 15 Mar 2013 18:18:43 +0530
Subject: [IMP] Oops sorry forgot to remove the prints and improved code.

bzr revid: psa@tinyerp.com-20130315124843-xtp19rbm2cvyfb67
---
 addons/mail/static/src/js/mail_followers.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 0bfcbfc29e9..b778f3bb6b2 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -112,9 +112,9 @@ openerp_mail_followers = function(session, mail) {
 
         on_apply_subtype: function(id, partner_id) {
             var check_list = new Array();
-            _($('.oe_edit_actions input[type="checkbox"]')).each(function (records) {
-                 if ($(records).is(':checked')) {
-                     check_list.push(parseInt($(records).data('id')));
+            _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
+                 if ($(record).is(':checked')) {
+                     check_list.push(parseInt($(record).data('id')));
                  }
             });
 
-- 
cgit v1.2.3


From cf3415f0877affc7f26ad16cd6a47ba671a9d601 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 19 Mar 2013 13:03:19 +0530
Subject: [IMP]Changed the position of methods and improved code.

bzr revid: psa@tinyerp.com-20130319073319-8myj2hx5iaqmi5xj
---
 addons/mail/static/src/js/mail_followers.js   | 4 ++--
 addons/mail/static/src/xml/mail_followers.xml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 9a9f5f2ba54..1ca65087316 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -92,9 +92,9 @@ openerp_mail_followers = function(session, mail) {
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
                                         self.on_apply_subtype(id, partner_id);
-                                        $dialog.remove();
+                                        $(this).remove();
                                     }},
-                                    { text: _t("Cancel"), click: function() { $dialog.remove(); }}
+                                    { text: _t("Cancel"), click: function() { $(this).remove(); }}
                                 ],
                     });
             this.ds_model.call('edit_followers_subtype', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 4a492cee713..ea11c26570b 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -48,6 +48,10 @@
         </table>
     </t>
 
+    <!--
+        followers.edit.subtype template
+        Template used to edit the display message subtypes of a follower subscription
+    -->
     <t t-name="mail.followers.edit.subtype">
         <table class='oe_subtype'>
             <tr>
-- 
cgit v1.2.3


From e9065f77273a544c99b546bf58201ee9c08b4b73 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 21 Mar 2013 18:10:36 +0530
Subject: [IMP] Reduced code, deleted redundant code, deleted the edit template
 and used it in the existing by using 'mode' and improved code using the
 existing code and removed unwanted code.

bzr revid: psa@tinyerp.com-20130321124036-0s4pv3oivzesmjh5
---
 addons/mail/static/src/js/mail_followers.js   | 53 +++++++++++++--------------
 addons/mail/static/src/xml/mail_followers.xml | 17 +--------
 2 files changed, 28 insertions(+), 42 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 1ca65087316..155cd74ebeb 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -81,37 +81,27 @@ openerp_mail_followers = function(session, mail) {
 
         on_edit_subtype: function(event) {
             var self = this;
-            var records = [];
             var partner_id = $(event.target).data('id');
-            var partner_name = $(event.target).siblings('a').text(); 
-            var id = this.view.datarecord.id;
-            var res_model = this.view.dataset.model;
-            var $dialog = new session.web.dialog($('<div class = "oe_edit_actions">'), {
+            var context = new session.web.CompoundContext(this.build_context(), {'partner_id': partner_id});
+            self.$dialog = new session.web.dialog($('<div class = "oe_edit_actions">'), {
                             modal: true,
-                            title: _t('Edit Subtypes of ') + '"' + partner_name + '"',
+                            width: 'auto',
+                            height: 'auto',
+                            title: _t('Edit Subscriptions of ') + $(event.target).siblings('a').text(),
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
-                                        self.on_apply_subtype(id, partner_id);
+                                        self.on_apply_subtype(partner_id);
                                         $(this).remove();
                                     }},
                                     { text: _t("Cancel"), click: function() { $(this).remove(); }}
                                 ],
                     });
-            this.ds_model.call('edit_followers_subtype', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {
-                    if (data[id]) {
-                        records = data[id].message_subtype_data;
-                        }
-                        _(records).each(function (record, record_name) {
-                            record.name = record_name;
-                            record.followed = record.followed || undefined;
-                           $(session.web.qweb.render("mail.followers.edit.subtype", {'record': record})).appendTo($dialog);
-                        });
-                });
+             return self.fetch_subtypes(context);
         },
 
-        on_apply_subtype: function(id, partner_id) {
+        on_apply_subtype: function(partner_id) {
             var check_list = new Array();
+            var id = this.view.datarecord.id;
             _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
                  if ($(record).is(':checked')) {
                      check_list.push(parseInt($(record).data('id')));
@@ -256,25 +246,34 @@ openerp_mail_followers = function(session, mail) {
         },
 
         /** Fetch subtypes, only if current user is follower */
-        fetch_subtypes: function () {
+        fetch_subtypes: function (context) {
             var self = this;
-            var subtype_list_ul = this.$('.oe_subtype_list').empty();
-            if (! this.message_is_follower) return;
+            var mode = "";
+            if (context && context.eval('partner_id')) {
+                mode = "edit_follower";
+            } else {
+                var subtype_list_ul = this.$('.oe_subtype_list').empty();
+                if (! this.message_is_follower) return;
+            }
             var id = this.view.datarecord.id;
-            this.ds_model.call('message_get_subscription_data', [[id], new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {self.display_subtypes(data, id);});
+            this.ds_model.call('message_get_subscription_data', [[id],context])
+                .then(function (data) {self.display_subtypes(data, id, mode);});
         },
 
         /** Display subtypes: {'name': default, followed} */
-        display_subtypes:function (data, id) {
+        display_subtypes:function (data, id, mode) {
             var self = this;
             var $list = this.$('.oe_subtype_list');
-            $list.empty().hide();
+            if (mode.length == 0){ $list.empty().hide();}
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') );
+                if (mode.length == 0) {
+                    $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( self.$('.oe_subtype_list') );
+                } else {
+                    $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo(self.$dialog);
+                }
             });
             if (_.size(records) > 1) {
                 $list.show();
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index ea11c26570b..6420046477c 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -42,21 +42,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
-            </tr>
-        </table>
-    </t>
-
-    <!--
-        followers.edit.subtype template
-        Template used to edit the display message subtypes of a follower subscription
-    -->
-    <t t-name="mail.followers.edit.subtype">
-        <table class='oe_subtype'>
-            <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_edit_check"/></td>
-                <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+mode+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+mode+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
     </t>
-- 
cgit v1.2.3


From f1db1ed7783b664ac3b6cceb085edfdddb7b8ee2 Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Fri, 22 Mar 2013 13:52:06 +0530
Subject: [IMP]Add method for checking the group technical features.

bzr revid: vja@tinyerp.com-20130322082206-x2490850o8qbkmk0
---
 addons/mail/static/src/js/mail_followers.js   | 9 +++++++--
 addons/mail/static/src/xml/mail_followers.xml | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 155cd74ebeb..c615ceb35e5 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -210,14 +210,19 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             this.followers = records || this.followers;
             this.message_is_follower = this.set_is_follower(this.followers);
+            this.check_access = false;
+
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                self.ds_model.call('check_access_right', [self.session.uid]).then(function(r){
+                    self.check_access = r;
+                    record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                    $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                })
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 6420046477c..bdcfd1e048c 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,8 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.session.uid === 1" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <t t-js="d">console.log("dsfsdfd",d)</t>
+        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From bd6a436bbb04b8121e58ad8b547ba8d7c67c3584 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 22 Mar 2013 14:40:26 +0530
Subject: [IMP] Added css for the ' Close(X)' icon of the dialog box when the
 title size increases than overlap the title.

bzr revid: psa@tinyerp.com-20130322091026-m0eqoqnt1t2p184v
---
 addons/mail/static/src/css/mail.css           | 4 +++-
 addons/mail/static/src/js/mail_followers.js   | 4 ++--
 addons/mail/static/src/xml/mail_followers.xml | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6d7d8875601..9805c9d3a61 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -646,7 +646,9 @@
     width: 10px !important;
     height: 12px !important;
 }
-
+.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
+    padding-right: 20px;
+}
 .openerp .oe_followers .oe_show_more{
     cursor: pointer;
 }
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index c615ceb35e5..7e49a391bca 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -218,8 +218,8 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.ds_model.call('check_access_right', [self.session.uid]).then(function(r){
-                    self.check_access = r;
+                self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){
+                    self.check_access = result;
                     record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                     $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
                 })
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index bdcfd1e048c..081111a9afd 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,6 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <t t-js="d">console.log("dsfsdfd",d)</t>
         <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
-- 
cgit v1.2.3


From 038630657c8dcd3223bd6008c6e32728ccecdeb9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 27 Mar 2013 16:41:48 +0100
Subject: [FIX] the created message is the last one in the thread list

bzr revid: mat@openerp.com-20130327154148-sjia6b39yjix6fm1
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ad69f7e41c3..98b5c57d652 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -734,7 +734,7 @@ openerp.mail = function (session) {
                 }
                 // create object and attach to the thread object
                 thread.message_fetch([["id", "=", message_id]], false, [message_id], function (arg, data) {
-                    var message = thread.create_message_object( data[0] );
+                    var message = thread.create_message_object( data.slice(-1)[0] );
                     // insert the message on dom
                     thread.insert_message( message, root ? undefined : self.$el, root );
                 });
-- 
cgit v1.2.3


From 5a112d8fa2f34d978e2580d706aef82b8e704e44 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 28 Mar 2013 17:16:34 +0100
Subject: [ADD] suggested groups

bzr revid: mat@openerp.com-20130328161634-1fcmj0s67bofc6ra
---
 addons/mail/static/src/css/mail.css         | 63 +++++++++++++++++++++++++++++
 addons/mail/static/src/js/mail.js           |  3 ++
 addons/mail/static/src/js/mail_followers.js |  2 +-
 addons/mail/static/src/xml/mail.xml         |  4 +-
 4 files changed, 68 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 51306727a09..9604a052c5c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -664,8 +664,71 @@
 .openerp .oe_mail_wall .oe_mail{
     margin: 16px;
     width: 600px;
+    display: inline-block;
 }
 
 .openerp .oe_mail .oe_view_nocontent > p {
     padding-left: 15px;
 }
+
+
+/* ------------- WALL SIDEBAR ------------- */
+
+.openerp .oe_mail_wall .oe_mail_wall_aside {
+    margin-left: 20px;
+    margin-top: 20px;
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    width: 300px;
+}
+
+.openerp .oe_mail_wall_aside > div {
+    background-color: #EDEDF6;
+    border-radius: 2px;
+    padding: 10px;
+}
+.openerp .oe_mail_wall_aside .oe_user_display {
+    font-size: 14px;
+    font-weight: bold;
+    margin-left: 10px;
+    color: #7C7BAD;
+}
+.openerp .oe_mail_wall_aside .oe_suggested_groups {
+    border-radius: 2px;
+    width: 100%;
+    margin-left: 10px;
+    height: 90px;
+}
+.openerp .oe_mail_wall_aside .oe_group_images {
+    width: 20%;
+    float: left;
+    padding-right: 20px;
+}
+.openerp .oe_mail_wall_aside .oe_group_image_content {
+    border-radius: 2px;
+    border: solid 1px rgba(0,0,0,0.03);
+}
+.openerp .oe_mail_wall_aside .oe_join_group {
+    margin-top: 10px;
+}
+.openerp .oe_mail_wall_aside .oe_follow_people {
+    margin-top: 10px;
+}
+.openerp .oe_mail_wall_aside .oe_remove_suggested_group {
+    visibility:hidden;
+    width:3%;
+    float:right;
+    margin-right:20px;
+}
+.openerp .oe_mail_wall_aside .oe_suggested_groups:hover .oe_remove_suggested_group > span {
+    visibility: visible;
+}
+.openerp .oe_mail_wall_aside .oe_suggest_groups .oe_group {
+    width: 80%;
+}
+.openerp .oe_mail_wall_aside .oe_suggest_groups .oe_group .oe_group_name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    width: 90%;
+}
\ 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 98b5c57d652..0290eb1c82b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -6,6 +6,7 @@ openerp.mail = function (session) {
 
     openerp_mail_followers(session, mail);        // import mail_followers.js
     openerp_FieldMany2ManyTagsEmail(session);      // import manyy2many_tags_email.js
+    
 
     /**
      * ------------------------------------------------------------
@@ -1991,4 +1992,6 @@ openerp.mail = function (session) {
             });
         },
     });
+
+    openerp.mail.suggestions(session, mail);
 };
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 6fc2f0fdfcd..79aa3f02dd3 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -3,7 +3,7 @@ openerp_mail_followers = function(session, mail) {
        _lt = session.web._lt;
 
     var mail_followers = session.mail_followers = {};
-
+    
     /** 
      * ------------------------------------------------------------
      * mail_followers Widget
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b26ef06f5e4..c7681181c6a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -195,6 +195,7 @@
           </tbody>
         </table>
         <div class="oe_mail-placeholder"></div>
+        <aside class="oe_mail_wall_aside"></aside>
     </div>
 
     <!--
@@ -320,7 +321,4 @@
         </a>
     </span>
 
-    <!-- mail.thread.message.star
-        Template used to display stared/unstared message in a mail.message
-    -->
 </template>
-- 
cgit v1.2.3


From 3af8beb2b91217d229617c7b154f9456b0cdf3ea Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 29 Mar 2013 09:01:40 +0100
Subject: [ADD] suggestion js and xml files

bzr revid: mat@openerp.com-20130329080140-t99dzeaiwikwjpsm
---
 addons/mail/static/src/js/suggestions.js   | 86 ++++++++++++++++++++++++++++++
 addons/mail/static/src/xml/suggestions.xml | 35 ++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 addons/mail/static/src/js/suggestions.js
 create mode 100644 addons/mail/static/src/xml/suggestions.xml

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
new file mode 100644
index 00000000000..23cc54a62a9
--- /dev/null
+++ b/addons/mail/static/src/js/suggestions.js
@@ -0,0 +1,86 @@
+openerp.mail.suggestions = function(session, mail) {
+    var _t = session.web._t;
+    var QWeb = session.web.qweb
+
+    var suggestions = session.suggestions = {};
+
+    suggestions.Sidebar = session.web.Widget.extend({
+        template: "mail.suggestions",
+        init: function (parent, action) {
+            var self = this;
+            this._super(parent, action);
+            this.res_user = new session.web.DataSetSearch(this, 'res.users');
+        },
+    });
+
+    var removed_suggested_group = session.removed_suggested_group = [];
+    suggestions.Groups = session.web.Widget.extend({
+        init: function (parent, action) {
+            console.log("init");
+            var self = this;
+            this._super(parent, action);
+            this.deferred = $.Deferred();
+            this.mail_group = new session.web.DataSetSearch(this, 'mail.group');
+            this.suggestions = [];
+        },
+        start: function() {
+            var self = this;
+            var args = arguments;
+            var res = self.get_suggested_group();
+            return $.when(res).done(function() {});
+        },
+        get_suggested_group: function () {
+            
+            var self = this;
+            var group = self.mail_group.call('get_suggested_thread', {'removed_suggested_threads':removed_suggested_group}).then(function(res) {
+                if(res.length<=0) {self.$(".oe_user_profile_group").hide();}
+                _(res).each(function(result) {
+                    result['image']=self.session.url('/web/binary/image', {model: 'mail.group', field: 'image_small', id: result.id});
+                });
+                self.suggestions = res
+            });
+            return $.when(group).done(function() {
+                self.$el.html( QWeb.render("mail.suggestions.groups", {'widget': self}) );
+                self.bind_events();
+            });
+        },
+        bind_events: function() {
+            var self = this;
+            this.$el.one('click', '.oe_remove_suggested_group', {data:this}, self.remove_suggested_group);
+            self.$el.one('click', '.oe_join_group', { data:self }, self.join_group);
+        },
+        join_group:function(event) {
+            var self = this;
+            console.log("join");
+            return event.data.data.mail_group.call('message_subscribe_users', [[$(self).attr('id')],[event.data.data.session.uid]]).then(function(res) {
+                event.data.data.get_suggested_group();
+            });
+        },
+        remove_suggested_group: function(event) {
+            var self = this;
+            console.log("remove");
+            removed_suggested_group.push($(self).attr('id'));
+            event.data.data.get_suggested_group();
+        },
+    });
+
+    mail.Wall.include({
+        start: function(options) {
+            this._super(options);
+            var self = this;
+            var sidebar = new suggestions.Sidebar(self);
+            sidebar.appendTo(self.$el.find('.oe_mail_wall_aside')).then( function() {
+                
+            });
+
+            var sug_groups = new suggestions.Groups(self);
+            // sug_groups.replace(self.$el.find('.oe_suggestions_groups'));
+            $.when(sug_groups.start()).done(function() {
+                //self.$el.find('.oe_suggestions_groups').html(sug_groups.$el.html());
+                sug_groups.replace( self.$el.find('.oe_suggestions_groups') );
+            });
+            
+        }
+    });
+
+};
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
new file mode 100644
index 00000000000..874226bb332
--- /dev/null
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+
+    <t t-name="mail.suggestions">
+        <div class="oe_suggestions_groups">No groups</div>
+    </t>
+
+    <!-- Suggested groups -->
+    <div t-name="mail.suggestions.groups" class="oe_sidebar_group">
+        <p class="oe_user_display">Suggested Groups</p>
+        <div class="oe_suggest_groups">
+            <t t-foreach="widget.suggestions" t-as="result">
+                <div class="oe_suggested_groups">
+                    <div class="oe_group_images">
+                        <a t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                            <img class="oe_group_image_content" t-attf-src="{result.image}"/>
+                        </a>
+                    </div>
+                    <div class="oe_group">
+                        <a class="oe_group_name" t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                            <t t-esc="result.name"/>
+                        </a>
+                        <a href="#" class="oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
+                            <span class="oe_kanban_action oe_kanban_action_a">X</span>
+                        </a>
+                        <br/>
+                        <button type="button" t-att-id="result.id" class="oe_join_group">Join Group</button>
+                    </div>
+                </div>
+            </t>
+        </div>
+    </div>
+
+
+</template>
-- 
cgit v1.2.3


From 64dcc8db926e4c08959b3cd781467c7c43675035 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 11:12:44 +0200
Subject: [IMP] CSS tweaks

bzr revid: mat@openerp.com-20130403091244-l3snsoja4t8c41q6
---
 addons/mail/static/src/css/mail.css        | 8 +++-----
 addons/mail/static/src/css/mail_group.css  | 1 -
 addons/mail/static/src/xml/suggestions.xml | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9604a052c5c..8768675e4ce 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -22,7 +22,7 @@
     width: 32px;
     height: 32px;
     padding: 0px;
-    margin: 0px
+    margin: 0px;
     border-radius: 0px;
 }
 
@@ -688,20 +688,18 @@
     border-radius: 2px;
     padding: 10px;
 }
-.openerp .oe_mail_wall_aside .oe_user_display {
+.openerp .oe_mail_wall_aside .oe_suggestion_display {
     font-size: 14px;
     font-weight: bold;
     margin-left: 10px;
-    color: #7C7BAD;
 }
 .openerp .oe_mail_wall_aside .oe_suggested_groups {
     border-radius: 2px;
     width: 100%;
     margin-left: 10px;
-    height: 90px;
+    min-height: 70px;  /* image_small 66x66px */
 }
 .openerp .oe_mail_wall_aside .oe_group_images {
-    width: 20%;
     float: left;
     padding-right: 20px;
 }
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index c1cefee9070..53f8b2fb010 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -44,7 +44,6 @@
   text-align: center;
   overflow: hidden;
   -moz-border-radius: 3px;
-  border-collapse: separate;
   -webkit-border-radius: 3px;
   -o-border-radius: 3px;
   -ms-border-radius: 3px;
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 874226bb332..515a3c2b497 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -7,7 +7,7 @@
 
     <!-- Suggested groups -->
     <div t-name="mail.suggestions.groups" class="oe_sidebar_group">
-        <p class="oe_user_display">Suggested Groups</p>
+        <p class="oe_suggestion_display">Suggested Groups</p>
         <div class="oe_suggest_groups">
             <t t-foreach="widget.suggestions" t-as="result">
                 <div class="oe_suggested_groups">
-- 
cgit v1.2.3


From 851e6c1f5a5d9a8b206e115760c7f2ae484341ce Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 14:24:08 +0200
Subject: [REF] cleaning js code

bzr revid: mat@openerp.com-20130403122408-fbbybeczf6xqwjvc
---
 addons/mail/static/src/css/mail.css        |  2 +-
 addons/mail/static/src/js/suggestions.js   | 50 +++++++++++++++++-------------
 addons/mail/static/src/xml/suggestions.xml |  8 ++---
 3 files changed, 33 insertions(+), 27 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 8768675e4ce..54990d0ed5f 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -723,7 +723,7 @@
     visibility: visible;
 }
 .openerp .oe_mail_wall_aside .oe_suggest_groups .oe_group {
-    width: 80%;
+    width: 90%;
 }
 .openerp .oe_mail_wall_aside .oe_suggest_groups .oe_group .oe_group_name {
     text-overflow: ellipsis;
diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
index 23cc54a62a9..eae7cafe79c 100644
--- a/addons/mail/static/src/js/suggestions.js
+++ b/addons/mail/static/src/js/suggestions.js
@@ -1,6 +1,6 @@
 openerp.mail.suggestions = function(session, mail) {
     var _t = session.web._t;
-    var QWeb = session.web.qweb
+    var QWeb = session.web.qweb;
 
     var suggestions = session.suggestions = {};
 
@@ -10,13 +10,17 @@ openerp.mail.suggestions = function(session, mail) {
             var self = this;
             this._super(parent, action);
             this.res_user = new session.web.DataSetSearch(this, 'res.users');
-        },
+        }
     });
 
     var removed_suggested_group = session.removed_suggested_group = [];
     suggestions.Groups = session.web.Widget.extend({
+        events: {
+            'click .oe_remove_suggested_group': "remove_suggested_group",
+            'click .oe_join_group': "join_group",
+            'click .oe_open_group': "open_group"
+        },
         init: function (parent, action) {
-            console.log("init");
             var self = this;
             this._super(parent, action);
             this.deferred = $.Deferred();
@@ -30,38 +34,44 @@ openerp.mail.suggestions = function(session, mail) {
             return $.when(res).done(function() {});
         },
         get_suggested_group: function () {
-            
             var self = this;
             var group = self.mail_group.call('get_suggested_thread', {'removed_suggested_threads':removed_suggested_group}).then(function(res) {
-                if(res.length<=0) {self.$(".oe_user_profile_group").hide();}
                 _(res).each(function(result) {
                     result['image']=self.session.url('/web/binary/image', {model: 'mail.group', field: 'image_small', id: result.id});
                 });
-                self.suggestions = res
+
+                self.suggestions = res;
             });
             return $.when(group).done(function() {
                 self.$el.html( QWeb.render("mail.suggestions.groups", {'widget': self}) );
-                self.bind_events();
+                if (self.suggestions.length === 0) {
+                    self.$(".oe_sidebar_group").hide();
+                }
             });
         },
-        bind_events: function() {
+        open_group:function(event) {
             var self = this;
-            this.$el.one('click', '.oe_remove_suggested_group', {data:this}, self.remove_suggested_group);
-            self.$el.one('click', '.oe_join_group', { data:self }, self.join_group);
+            var id = JSON.parse($(event.currentTarget).attr("id"));
+            action = {
+                type: 'ir.actions.act_window',
+                res_model: 'mail.group',
+                res_id: id,
+                views: [[false, 'form']],
+                target: 'current'
+            };
+            this.do_action(action);
         },
         join_group:function(event) {
             var self = this;
-            console.log("join");
-            return event.data.data.mail_group.call('message_subscribe_users', [[$(self).attr('id')],[event.data.data.session.uid]]).then(function(res) {
-                event.data.data.get_suggested_group();
+            return this.mail_group.call('message_subscribe_users', [[$(event.currentTarget).attr('id')],[this.session.uid]]).then(function(res) {
+                self.get_suggested_group();
             });
         },
         remove_suggested_group: function(event) {
             var self = this;
-            console.log("remove");
-            removed_suggested_group.push($(self).attr('id'));
-            event.data.data.get_suggested_group();
-        },
+            removed_suggested_group.push($(event.currentTarget).attr('id'));
+            self.get_suggested_group();
+        }
     });
 
     mail.Wall.include({
@@ -69,9 +79,7 @@ openerp.mail.suggestions = function(session, mail) {
             this._super(options);
             var self = this;
             var sidebar = new suggestions.Sidebar(self);
-            sidebar.appendTo(self.$el.find('.oe_mail_wall_aside')).then( function() {
-                
-            });
+            sidebar.appendTo(self.$el.find('.oe_mail_wall_aside'));
 
             var sug_groups = new suggestions.Groups(self);
             // sug_groups.replace(self.$el.find('.oe_suggestions_groups'));
@@ -79,7 +87,7 @@ openerp.mail.suggestions = function(session, mail) {
                 //self.$el.find('.oe_suggestions_groups').html(sug_groups.$el.html());
                 sug_groups.replace( self.$el.find('.oe_suggestions_groups') );
             });
-            
+
         }
     });
 
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 515a3c2b497..35ef62d8acd 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -12,15 +12,13 @@
             <t t-foreach="widget.suggestions" t-as="result">
                 <div class="oe_suggested_groups">
                     <div class="oe_group_images">
-                        <a t-attf-href="#model=mail.group&amp;id=#{result.id}">
-                            <img class="oe_group_image_content" t-attf-src="{result.image}"/>
-                        </a>
+                        <img class="oe_group_image_content oe_open_group" t-attf-src="{result.image}" t-attf-id="{result.id}"/>
                     </div>
                     <div class="oe_group">
-                        <a class="oe_group_name" t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                        <a class="oe_group_name oe_open_group" t-attf-id="{result.id}">
                             <t t-esc="result.name"/>
                         </a>
-                        <a href="#" class="oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
+                        <a class="oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
                             <span class="oe_kanban_action oe_kanban_action_a">X</span>
                         </a>
                         <br/>
-- 
cgit v1.2.3


From 8d8eb553ceac3b3c4ca037c442c7f1714c0d9a12 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 16:27:16 +0200
Subject: [ADD] suggestions for employees to follow

bzr revid: mat@openerp.com-20130403142716-lmsz9hwkg7tathly
---
 addons/mail/static/src/css/mail.css         | 19 ++++++++-----------
 addons/mail/static/src/js/mail_followers.js |  2 ++
 addons/mail/static/src/js/suggestions.js    |  1 -
 addons/mail/static/src/xml/suggestions.xml  | 14 +++++++-------
 4 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 54990d0ed5f..d22b58bde74 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -693,39 +693,36 @@
     font-weight: bold;
     margin-left: 10px;
 }
-.openerp .oe_mail_wall_aside .oe_suggested_groups {
+.openerp .oe_mail_wall_aside .oe_suggested_item {
     border-radius: 2px;
     width: 100%;
     margin-left: 10px;
     min-height: 70px;  /* image_small 66x66px */
 }
-.openerp .oe_mail_wall_aside .oe_group_images {
+.openerp .oe_mail_wall_aside .oe_item_image {
     float: left;
     padding-right: 20px;
 }
-.openerp .oe_mail_wall_aside .oe_group_image_content {
+.openerp .oe_mail_wall_aside .oe_item_image_content {
     border-radius: 2px;
     border: solid 1px rgba(0,0,0,0.03);
 }
-.openerp .oe_mail_wall_aside .oe_join_group {
+.openerp .oe_mail_wall_aside .oe_suggestion_action {
     margin-top: 10px;
 }
-.openerp .oe_mail_wall_aside .oe_follow_people {
-    margin-top: 10px;
-}
-.openerp .oe_mail_wall_aside .oe_remove_suggested_group {
+.openerp .oe_mail_wall_aside .oe_remove_suggested_item {
     visibility:hidden;
     width:3%;
     float:right;
     margin-right:20px;
 }
-.openerp .oe_mail_wall_aside .oe_suggested_groups:hover .oe_remove_suggested_group > span {
+.openerp .oe_mail_wall_aside .oe_suggested_item:hover .oe_remove_suggested_item > span {
     visibility: visible;
 }
-.openerp .oe_mail_wall_aside .oe_suggest_groups .oe_group {
+.openerp .oe_mail_wall_aside .oe_item {
     width: 90%;
 }
-.openerp .oe_mail_wall_aside .oe_suggest_groups .oe_group .oe_group_name {
+.openerp .oe_mail_wall_aside .oe_item .oe_item_name {
     text-overflow: ellipsis;
     overflow: hidden;
     width: 90%;
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 79aa3f02dd3..cf63b79e2ed 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -28,7 +28,9 @@ openerp_mail_followers = function(session, mail) {
             this.comment = this.node.attrs.help || false;
             this.displayed_limit = this.node.attrs.displayed_nb || 10;
             this.displayed_nb = this.displayed_limit;
+            console.log(this.displayed_nb);
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
+            console.log(this.ds_model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
 
diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
index eae7cafe79c..137607a7643 100644
--- a/addons/mail/static/src/js/suggestions.js
+++ b/addons/mail/static/src/js/suggestions.js
@@ -29,7 +29,6 @@ openerp.mail.suggestions = function(session, mail) {
         },
         start: function() {
             var self = this;
-            var args = arguments;
             var res = self.get_suggested_group();
             return $.when(res).done(function() {});
         },
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 35ef62d8acd..949e421143c 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -10,19 +10,19 @@
         <p class="oe_suggestion_display">Suggested Groups</p>
         <div class="oe_suggest_groups">
             <t t-foreach="widget.suggestions" t-as="result">
-                <div class="oe_suggested_groups">
-                    <div class="oe_group_images">
-                        <img class="oe_group_image_content oe_open_group" t-attf-src="{result.image}" t-attf-id="{result.id}"/>
+                <div class="oe_suggested_item">
+                    <div class="oe_item_image">
+                        <img class="oe_item_image_content oe_open_group" t-attf-src="{result.image}" t-attf-id="{result.id}"/>
                     </div>
-                    <div class="oe_group">
-                        <a class="oe_group_name oe_open_group" t-attf-id="{result.id}">
+                    <div class="oe_item">
+                        <a class="oe_item_name oe_open_group" t-attf-id="{result.id}">
                             <t t-esc="result.name"/>
                         </a>
-                        <a class="oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
+                        <a class="oe_remove_suggested_item oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
                             <span class="oe_kanban_action oe_kanban_action_a">X</span>
                         </a>
                         <br/>
-                        <button type="button" t-att-id="result.id" class="oe_join_group">Join Group</button>
+                        <button t-att-id="result.id" class="oe_suggestion_action oe_join_group">Join Group</button>
                     </div>
                 </div>
             </t>
-- 
cgit v1.2.3


From 46110fbf2995f3a8104f3f08007db4cf43000a85 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 17:10:56 +0200
Subject: [ADD] option to globally stop showing group suggestions

bzr revid: mat@openerp.com-20130403151056-4vjno2k9n77drm6y
---
 addons/mail/static/src/css/mail.css        | 10 ++++++----
 addons/mail/static/src/js/suggestions.js   |  8 ++++++++
 addons/mail/static/src/xml/suggestions.xml |  9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d22b58bde74..9076ae0387e 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -683,7 +683,7 @@
     width: 300px;
 }
 
-.openerp .oe_mail_wall_aside > div {
+.openerp .oe_mail_wall_aside .oe_sidebar_suggestion {
     background-color: #EDEDF6;
     border-radius: 2px;
     padding: 10px;
@@ -710,16 +710,18 @@
 .openerp .oe_mail_wall_aside .oe_suggestion_action {
     margin-top: 10px;
 }
-.openerp .oe_mail_wall_aside .oe_remove_suggested_item {
+.openerp .oe_mail_wall_aside .oe_remove_suggested_item,
+.openerp .oe_mail_wall_aside .oe_remove_suggestion {
     visibility:hidden;
     width:3%;
     float:right;
     margin-right:20px;
 }
-.openerp .oe_mail_wall_aside .oe_suggested_item:hover .oe_remove_suggested_item > span {
+.openerp .oe_mail_wall_aside .oe_suggested_item:hover .oe_remove_suggested_item > span,
+.openerp .oe_mail_wall_aside .oe_suggestion_display:hover .oe_remove_suggestion > span {
     visibility: visible;
 }
-.openerp .oe_mail_wall_aside .oe_item {
+.openerp .oe_mail_wall_aside .oe_item,.oe_suggestion_display {
     width: 90%;
 }
 .openerp .oe_mail_wall_aside .oe_item .oe_item_name {
diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
index 137607a7643..ad0867f4930 100644
--- a/addons/mail/static/src/js/suggestions.js
+++ b/addons/mail/static/src/js/suggestions.js
@@ -16,6 +16,7 @@ openerp.mail.suggestions = function(session, mail) {
     var removed_suggested_group = session.removed_suggested_group = [];
     suggestions.Groups = session.web.Widget.extend({
         events: {
+            'click .oe_remove_suggestion_employees': "remove_employee_suggestions",
             'click .oe_remove_suggested_group': "remove_suggested_group",
             'click .oe_join_group': "join_group",
             'click .oe_open_group': "open_group"
@@ -25,6 +26,7 @@ openerp.mail.suggestions = function(session, mail) {
             this._super(parent, action);
             this.deferred = $.Deferred();
             this.mail_group = new session.web.DataSetSearch(this, 'mail.group');
+            this.res_users = new session.web.DataSetSearch(this, 'res.users');
             this.suggestions = [];
         },
         start: function() {
@@ -70,6 +72,12 @@ openerp.mail.suggestions = function(session, mail) {
             var self = this;
             removed_suggested_group.push($(event.currentTarget).attr('id'));
             self.get_suggested_group();
+        },
+        remove_employee_suggestions: function(event) {
+            var self = this;
+            return this.res_users.call('stop_showing_group_suggestions', [this.session.uid]).then(function(res) {
+                self.$(".oe_sidebar_group").hide();
+            });
         }
     });
 
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 949e421143c..1ebd2f6276c 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -6,8 +6,13 @@
     </t>
 
     <!-- Suggested groups -->
-    <div t-name="mail.suggestions.groups" class="oe_sidebar_group">
-        <p class="oe_suggestion_display">Suggested Groups</p>
+    <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_sidebar_group">
+        <p class="oe_suggestion_display">
+            Suggested Groups
+            <a class="oe_remove_suggestion oe_remove_suggestion_employees" rol="button">
+                <span class="oe_kanban_action oe_kanban_action_a">X</span>
+            </a>
+        </p>
         <div class="oe_suggest_groups">
             <t t-foreach="widget.suggestions" t-as="result">
                 <div class="oe_suggested_item">
-- 
cgit v1.2.3


From 52ddce88f338d8c904efe6b652f1a236da2763fc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 3 Apr 2013 17:24:43 +0200
Subject: [ADD] option to globally stop showing employeep suggestions

bzr revid: mat@openerp.com-20130403152443-3jqg0v182mcqsk0f
---
 addons/mail/static/src/js/suggestions.js   | 6 +++---
 addons/mail/static/src/xml/suggestions.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
index ad0867f4930..205f8b2f27d 100644
--- a/addons/mail/static/src/js/suggestions.js
+++ b/addons/mail/static/src/js/suggestions.js
@@ -16,7 +16,7 @@ openerp.mail.suggestions = function(session, mail) {
     var removed_suggested_group = session.removed_suggested_group = [];
     suggestions.Groups = session.web.Widget.extend({
         events: {
-            'click .oe_remove_suggestion_employees': "remove_employee_suggestions",
+            'click .oe_remove_suggestion_groups': "remove_suggestion_groups",
             'click .oe_remove_suggested_group': "remove_suggested_group",
             'click .oe_join_group': "join_group",
             'click .oe_open_group': "open_group"
@@ -73,9 +73,9 @@ openerp.mail.suggestions = function(session, mail) {
             removed_suggested_group.push($(event.currentTarget).attr('id'));
             self.get_suggested_group();
         },
-        remove_employee_suggestions: function(event) {
+        remove_suggestion_groups: function(event) {
             var self = this;
-            return this.res_users.call('stop_showing_group_suggestions', [this.session.uid]).then(function(res) {
+            return this.res_users.call('stop_showing_groups_suggestions', [this.session.uid]).then(function(res) {
                 self.$(".oe_sidebar_group").hide();
             });
         }
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index 1ebd2f6276c..d90e6b12b03 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -9,7 +9,7 @@
     <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_sidebar_group">
         <p class="oe_suggestion_display">
             Suggested Groups
-            <a class="oe_remove_suggestion oe_remove_suggestion_employees" rol="button">
+            <a class="oe_remove_suggestion oe_remove_suggestion_groups" rol="button">
                 <span class="oe_kanban_action oe_kanban_action_a">X</span>
             </a>
         </p>
-- 
cgit v1.2.3


From b32cc3b4427c6d59581da13d039bde931ce82a5c Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 4 Apr 2013 12:37:23 +0530
Subject: [IMP] Improved code 1) Edit Subscriptions of -> Edit Subscription
 (without 's') of 2) Instead of defining a new 'apply_edited_subtype', you can
 use 'message_subscribe' that has an optional 'subtype_ids' parameter that
 already allows to manage subtypes of a subscription. 3) In
 _get_subscription_data: do not use context when it is not necessary. Please
 add a parameter user_id=None that will be used instead of uid to find
 user_pid. 4) Instead of defining a new 'on_apply_subtype', can't you reuse
 'do_update_subscription' with maybe some update to handle the classic use /
 edit widget ? The above changes has been done.

bzr revid: psa@tinyerp.com-20130404070723-5v1v35fte6vl2b2j
---
 addons/mail/static/src/js/mail_followers.js | 55 ++++++++++++-----------------
 1 file changed, 22 insertions(+), 33 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 7e49a391bca..bc15eed3fd9 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -82,38 +82,20 @@ openerp_mail_followers = function(session, mail) {
         on_edit_subtype: function(event) {
             var self = this;
             var partner_id = $(event.target).data('id');
-            var context = new session.web.CompoundContext(this.build_context(), {'partner_id': partner_id});
-            self.$dialog = new session.web.dialog($('<div class = "oe_edit_actions">'), {
+            self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
                             modal: true,
                             width: 'auto',
                             height: 'auto',
-                            title: _t('Edit Subscriptions of ') + $(event.target).siblings('a').text(),
+                            title: _t('Edit Subscription of ') + $(event.target).siblings('a').text(),
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
-                                        self.on_apply_subtype(partner_id);
+                                        self.do_update_subscription(event, partner_id);
                                         $(this).remove();
                                     }},
                                     { text: _t("Cancel"), click: function() { $(this).remove(); }}
                                 ],
                     });
-             return self.fetch_subtypes(context);
-        },
-
-        on_apply_subtype: function(partner_id) {
-            var check_list = new Array();
-            var id = this.view.datarecord.id;
-            _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
-                 if ($(record).is(':checked')) {
-                     check_list.push(parseInt($(record).data('id')));
-                 }
-            });
-
-            if (!check_list.length) {
-                this.do_unfollow();
-            } else {
-                return this.ds_model.call('apply_edited_subtypes', [[id], partner_id, check_list, new session.web.CompoundContext(this.build_context(), {})])
-                    .then(this.proxy('read_value'));
-            }
+             return self.fetch_subtypes(partner_id);
         },
 
         on_invite_follower: function (event) {
@@ -251,17 +233,17 @@ openerp_mail_followers = function(session, mail) {
         },
 
         /** Fetch subtypes, only if current user is follower */
-        fetch_subtypes: function (context) {
+        fetch_subtypes: function (partner_id) {
             var self = this;
             var mode = "";
-            if (context && context.eval('partner_id')) {
+            if (partner_id) {
                 mode = "edit_follower";
             } else {
                 var subtype_list_ul = this.$('.oe_subtype_list').empty();
                 if (! this.message_is_follower) return;
             }
             var id = this.view.datarecord.id;
-            this.ds_model.call('message_get_subscription_data', [[id],context])
+            this.ds_model.call('message_get_subscription_data', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
                 .then(function (data) {self.display_subtypes(data, id, mode);});
         },
 
@@ -307,23 +289,30 @@ openerp_mail_followers = function(session, mail) {
             return false;
         },
 
-        do_update_subscription: function (event) {
+        do_update_subscription: function (event, partner_id) {
             var self = this;
 
             var checklist = new Array();
-            _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
-                if ($(record).is(':checked')) {
-                    checklist.push(parseInt($(record).data('id')));
-                }
-            });
-
+            if (partner_id) {
+                _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
+                    if ($(record).is(':checked')) {
+                        checklist.push(parseInt($(record).data('id')));
+                    }
+                });
+            } else {
+                _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
+                    if ($(record).is(':checked')) {
+                        checklist.push(parseInt($(record).data('id')));
+                    }
+                });
+            }
             if (!checklist.length) {
                 if (!this.do_unfollow()) {
                     $(event.target).attr("checked", "checked");
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], checklist, context])
+                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], partner_id, checklist, context])
                     .then(this.proxy('read_value'));
             }
         },
-- 
cgit v1.2.3


From 9a2a45c768b77fb829582f060221a90340445da1 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 4 Apr 2013 14:17:24 +0530
Subject: [IMP] Improved code and removed unwanted code. As suggested by tde in
 his comment >>  **What's the purpose of defining a new 'check_access_right' ?
 Limiting to 'group_no_one' does not seems a viable solution. Instead, access
 rights on mail.followers entries should be correctly written (please check it
 is the case). I think having an asynchronous call just to check access rights
 is not necessary. In debug mode, always display the button.**

bzr revid: psa@tinyerp.com-20130404084724-meqsx35jdvk56z2c
---
 addons/mail/static/src/js/mail_followers.js   | 9 ++-------
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index bc15eed3fd9..02cf01d9889 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -192,19 +192,14 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             this.followers = records || this.followers;
             this.message_is_follower = this.set_is_follower(this.followers);
-            this.check_access = false;
-
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){
-                    self.check_access = result;
-                    record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                    $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
-                })
+                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 081111a9afd..960c399ecce 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From e61d6bae165444015ef37f71ae1e3c13f42ec253 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 5 Apr 2013 19:14:25 +0530
Subject: [IMP] Improved code and passed user_id=None as optional field.

bzr revid: psa@tinyerp.com-20130405134425-3xfbbv3vapq1un68
---
 addons/mail/static/src/js/mail_followers.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 02cf01d9889..83b46f9f951 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -264,7 +264,7 @@ openerp_mail_followers = function(session, mail) {
 
         do_follow: function () {
             var context = new session.web.CompoundContext(this.build_context(), {});
-            this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context])
+            this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, undefined, context])
                 .then(this.proxy('read_value'));
 
             _.each(this.$('.oe_subtype_list input'), function (record) {
@@ -288,19 +288,15 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
 
             var checklist = new Array();
-            if (partner_id) {
-                _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
-                    if ($(record).is(':checked')) {
-                        checklist.push(parseInt($(record).data('id')));
-                    }
-                });
-            } else {
-                _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
-                    if ($(record).is(':checked')) {
-                        checklist.push(parseInt($(record).data('id')));
-                    }
-                });
-            }
+            var subtype_checkbox = _(this.$('.oe_actions input[type="checkbox"]'))
+             if (partner_id) {
+                subtype_checkbox = _($('.oe_edit_actions input[type="checkbox"]'))
+             }
+            subtype_checkbox.each(function (record) {
+                if ($(record).is(':checked')) {
+                    checklist.push(parseInt($(record).data('id')));
+                }
+            });
             if (!checklist.length) {
                 if (!this.do_unfollow()) {
                     $(event.target).attr("checked", "checked");
-- 
cgit v1.2.3


From 1769067ddd9b4b7b51ae4c0d430587e1287af22d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 9 Apr 2013 10:09:32 +0530
Subject: [IMP] Improved code and removed unwanted 'None'.

bzr revid: psa@tinyerp.com-20130409043932-z5c8hupbhrednwa0
---
 addons/mail/static/src/js/mail_followers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 83b46f9f951..93f8f995ec7 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -297,13 +297,14 @@ openerp_mail_followers = function(session, mail) {
                     checklist.push(parseInt($(record).data('id')));
                 }
             });
+
             if (!checklist.length) {
                 if (!this.do_unfollow()) {
                     $(event.target).attr("checked", "checked");
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], partner_id, checklist, context])
+                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], checklist, partner_id, context])
                     .then(this.proxy('read_value'));
             }
         },
-- 
cgit v1.2.3


From 5bbffbc39c899adb92d251a3c8ef7f06e39338a7 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 11 Apr 2013 18:05:37 +0530
Subject: [IMP] Improved code and made the EDIT followers visible when
 'Technical Features' are given and it is in 'DEBUG mode'.

bzr revid: psa@tinyerp.com-20130411123537-2wzb468o7o0dno8c
---
 addons/mail/static/src/js/mail_followers.js   | 8 ++++++--
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 93f8f995ec7..09f54f012ce 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -192,14 +192,18 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             this.followers = records || this.followers;
             this.message_is_follower = this.set_is_follower(this.followers);
+            this.check_access = false;
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){
+                    self.check_access = result;
+                    record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                    $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+              })
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 88f38146de3..ca0064cbc78 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug and widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From c1a04891566456e18d869a9e0c55759f84d02d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 16 Apr 2013 15:44:05 +0200
Subject: [FIX] Chatter: fixed calls to refactored methos.

bzr revid: tde@openerp.com-20130416134405-nxtwbvxbz77pxufx
---
 addons/mail/static/src/js/mail.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b1a579ba057..193fc25281f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -620,10 +620,7 @@ openerp.mail = function (session) {
             // have unknown names -> call message_get_partner_info_from_emails to try to find partner_id
             var find_done = $.Deferred();
             if (names_to_find.length > 0) {
-                var values = {
-                    'res_id': this.context.default_res_id,
-                }
-                find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [names_to_find], values);
+                find_done = self.parent_thread.ds_thread._model.call('message_partner_info_from_emails', [this.context.default_res_id, names_to_find]);
             }
             else {
                 find_done.resolve([]);
@@ -669,11 +666,7 @@ openerp.mail = function (session) {
                     var new_names_to_find = _.difference(names_to_find, names_to_remove);
                     find_done = $.Deferred();
                     if (new_names_to_find.length > 0) {
-                        var values = {
-                            'link_mail': true,
-                            'res_id': self.context.default_res_id,
-                        }
-                        find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [new_names_to_find], values);
+                        find_done = self.parent_thread.ds_thread._model.call('message_partner_info_from_emails', [self.context.default_res_id, new_names_to_find, true]);
                     }
                     else {
                         find_done.resolve([]);
-- 
cgit v1.2.3


From cbeb793c57b89b1d1d91b5f5d33912a0d966d825 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 17 Apr 2013 10:07:14 +0200
Subject: [IMP] remove manual subscription and better css

bzr revid: mat@openerp.com-20130417080714-8taku42rc1eanz1q
---
 addons/mail/static/src/css/mail.css | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9393337c15c..704ae4a3d83 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -679,12 +679,11 @@
 /* ------------- WALL SIDEBAR ------------- */
 
 .openerp .oe_mail_wall .oe_mail_wall_aside {
-    margin-left: 20px;
-    margin-top: 20px;
+    margin-top: 15px;
     position: relative;
     display: inline-block;
     vertical-align: top;
-    width: 300px;
+    width: 260px;
 }
 
 .openerp .oe_mail_wall_aside .oe_sidebar_suggestion {
@@ -701,11 +700,11 @@
     border-radius: 2px;
     width: 100%;
     margin-left: 10px;
-    min-height: 70px;  /* image_small 66x66px */
+    min-height: 67px;  /* image_small 66x66px */
 }
 .openerp .oe_mail_wall_aside .oe_item_image {
     float: left;
-    padding-right: 20px;
+    padding-right: 10px;
 }
 .openerp .oe_mail_wall_aside .oe_item_image_content {
     border-radius: 2px;
@@ -716,10 +715,10 @@
 }
 .openerp .oe_mail_wall_aside .oe_remove_suggested_item,
 .openerp .oe_mail_wall_aside .oe_remove_suggestion {
-    visibility:hidden;
-    width:3%;
-    float:right;
-    margin-right:20px;
+    visibility: hidden;
+    width: 3%;
+    float: right;
+    margin-right: 10px;
 }
 .openerp .oe_mail_wall_aside .oe_suggested_item:hover .oe_remove_suggested_item > span,
 .openerp .oe_mail_wall_aside .oe_suggestion_display:hover .oe_remove_suggestion > span {
-- 
cgit v1.2.3


From 67bffc62c4d443b2b4315b10c1872d136e3a18ef Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 17 Apr 2013 17:17:21 +0200
Subject: [IMP] clean code

bzr revid: mat@openerp.com-20130417151721-fmwd143gazkldvu3
---
 addons/mail/static/src/xml/suggestions.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index d90e6b12b03..f868194ded6 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -2,7 +2,7 @@
 <template>
 
     <t t-name="mail.suggestions">
-        <div class="oe_suggestions_groups">No groups</div>
+        <div class="oe_suggestions_groups"></div>
     </t>
 
     <!-- Suggested groups -->
-- 
cgit v1.2.3


From fe8cfcceba85ed63d21e861282958cb9f5027b15 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 18 Apr 2013 09:53:49 +0200
Subject: [IMP] use related field on author's image for mail messages

bzr revid: mat@openerp.com-20130418075349-l71lf8kdw1er2tzs
---
 addons/mail/static/src/js/mail.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 55b8e4b4451..fe298b3ac65 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -257,15 +257,16 @@ openerp.mail = function (session) {
 
         /* Convert date, timerelative and avatar in displayable data. */
         format_data: function () {
+
             //formating and add some fields for render
             this.date = this.date ? session.web.str_to_datetime(this.date) : false;
             if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
                 this.timerelative = $.timeago(this.date);
-            } 
+            }
             if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
                 this.avatar = ('/mail/static/src/img/email_icon.png');
             } else if (this.author_id && this.template != 'mail.compose_message') {
-                this.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', this.author_id[0]);
+                this.avatar = mail.ChatterUtils.get_image(this.session, 'mail.message', 'image_small', this.id);
             } else {
                 this.avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             }
-- 
cgit v1.2.3


From a965a8b5b84bae83888d787726a032b7cfb3369e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 19 Apr 2013 09:34:38 +0200
Subject: [IMP] remove console.log

bzr revid: mat@openerp.com-20130419073438-qud2vnbh6zx85dcl
---
 addons/mail/static/src/js/mail_followers.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index ea9cc0475b9..328f818ed74 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -28,9 +28,7 @@ openerp_mail_followers = function(session, mail) {
             this.comment = this.node.attrs.help || false;
             this.displayed_limit = this.node.attrs.displayed_nb || 10;
             this.displayed_nb = this.displayed_limit;
-            console.log(this.displayed_nb);
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
-            console.log(this.ds_model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
 
-- 
cgit v1.2.3


From 85a807a5153d357e83a0f01d4940b5c6c2582403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Apr 2013 17:36:45 +0200
Subject: [REF] Chatter: refactored system for read more / read less, now based
 on html_email_clean instead of the expander library.

bzr revid: tde@openerp.com-20130423153645-k8vcb9hiuapzf7sg
---
 addons/mail/static/src/js/mail.js   | 16 ++++++----------
 addons/mail/static/src/xml/mail.xml |  8 +++++++-
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b1a579ba057..5ab6d2380a0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -224,6 +224,7 @@ openerp.mail = function (session) {
             this.name = datasets.name ||  false,
             this.record_name = datasets.record_name ||  false,
             this.body = datasets.body || '',
+            this.body_short = datasets.body_short || '',
             this.vote_nb = datasets.vote_nb || 0,
             this.has_voted = datasets.has_voted ||  false,
             this.is_favorite = datasets.is_favorite ||  false,
@@ -939,7 +940,6 @@ openerp.mail = function (session) {
         
         start: function () {
             this._super.apply(this, arguments);
-            this.expender();
             this.bind_events();
             if(this.thread_level < this.options.display_indented_thread) {
                 this.create_thread();
@@ -962,6 +962,8 @@ openerp.mail = function (session) {
             this.$('.oe_reply').on('click', this.on_message_reply);
             this.$('.oe_star').on('click', this.on_star);
             this.$('.oe_msg_vote').on('click', this.on_vote);
+            this.$('.oe_mail_expand').on('click', this.on_expand);
+            this.$('.oe_mail_reduce').on('click', this.on_expand);
         },
 
         /* Call the on_compose_message on the thread of this message. */
@@ -972,15 +974,9 @@ openerp.mail = function (session) {
             return false;
         },
 
-        expender: function () {
-            this.$('.oe_msg_body:first').expander({
-                slicePoint: this.options.truncate_limit,
-                expandText: 'read more',
-                userCollapseText: 'read less',
-                detailClass: 'oe_msg_tail',
-                moreClass: 'oe_mail_expand',
-                lessClass: 'oe_mail_reduce',
-                });
+        on_expand: function (event) {
+            this.$('.oe_msg_body_short:first').toggle();
+            this.$('.oe_msg_body_long:first').toggle();
         },
 
         /**
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7e7d772397a..9958cb5e595 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -254,7 +254,13 @@
                         <t t-if="widget.subject" t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <t t-raw="widget.body"/>
+                        <t t-if="widget.body_short">
+                            <div class="oe_msg_body_short"><t t-raw="widget.body_short"/><span class="oe_mail_expand"><a href="#">... read more</a></span></div>
+                            <div class="oe_msg_body_long" style="display: none;"><t t-raw="widget.body"/><span class="oe_mail_reduce"><a href="#">read less</a></span></div>
+                        </t>
+                        <t t-if="! widget.body_short">
+                            <t t-raw="widget.body"/>
+                        </t>
                     </div>
                 </div>
                 <div class="oe_msg_footer">
-- 
cgit v1.2.3


From e0ea2dbdcb7af84f2f3bdab228bb4805ce9a56f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Apr 2013 12:43:36 +0200
Subject: [IMP] Chatter: first message is truncated after 100 characters, other
 messages after 300 characters; cleaned code about expan management.

bzr revid: tde@openerp.com-20130425104336-3xvdwgwanrutzinp
---
 addons/mail/static/src/css/mail.css | 3 +++
 addons/mail/static/src/js/mail.js   | 2 ++
 addons/mail/static/src/xml/mail.xml | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6bc086a5b58..6bde62bcd4b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -108,6 +108,9 @@
     text-overflow:ellipsis;
     word-wrap: break-word;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body .oe_mail_cleaned {
+    display: none;
+}
 
 /* a) Indented Messages */
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5ab6d2380a0..81a800b7357 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -975,8 +975,10 @@ openerp.mail = function (session) {
         },
 
         on_expand: function (event) {
+            event.stopPropagation();
             this.$('.oe_msg_body_short:first').toggle();
             this.$('.oe_msg_body_long:first').toggle();
+            return false;
         },
 
         /**
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 9958cb5e595..dfbabcd1f89 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -255,7 +255,7 @@
                     </h1>
                     <div class="oe_msg_body">
                         <t t-if="widget.body_short">
-                            <div class="oe_msg_body_short"><t t-raw="widget.body_short"/><span class="oe_mail_expand"><a href="#">... read more</a></span></div>
+                            <div class="oe_msg_body_short"><t t-raw="widget.body_short"/></div>
                             <div class="oe_msg_body_long" style="display: none;"><t t-raw="widget.body"/><span class="oe_mail_reduce"><a href="#">read less</a></span></div>
                         </t>
                         <t t-if="! widget.body_short">
-- 
cgit v1.2.3


From 0525c965a9aa4f86d77c76ec272f864e3614ff51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 15 May 2013 12:35:18 +0200
Subject: [CLEAN] [REF] mail, hr: cleaned JS/CSS/XML code for suggestion
 widgets. Those are now 2 widgets extending web.Widget, included inside a
 Sidebar widget.

bzr revid: tde@openerp.com-20130515103518-2djzogjdtjh0n7rl
---
 addons/mail/static/src/css/mail.css        |  49 +++++++------
 addons/mail/static/src/js/mail.js          |  33 +++++++--
 addons/mail/static/src/js/suggestions.js   | 110 +++++++++++------------------
 addons/mail/static/src/xml/mail.xml        |   7 ++
 addons/mail/static/src/xml/suggestions.xml |  42 +++++------
 5 files changed, 127 insertions(+), 114 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 704ae4a3d83..f3869b6a5a4 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -679,56 +679,61 @@
 /* ------------- WALL SIDEBAR ------------- */
 
 .openerp .oe_mail_wall .oe_mail_wall_aside {
-    margin-top: 15px;
+    margin: 16px;
     position: relative;
     display: inline-block;
     vertical-align: top;
     width: 260px;
 }
-
 .openerp .oe_mail_wall_aside .oe_sidebar_suggestion {
     background-color: #EDEDF6;
     border-radius: 2px;
-    padding: 10px;
+    padding-top: 1px;
 }
-.openerp .oe_mail_wall_aside .oe_suggestion_display {
+.openerp .oe_sidebar_suggestion .oe_suggest_title h2 {
     font-size: 14px;
     font-weight: bold;
     margin-left: 10px;
+    padding: 0px;
 }
-.openerp .oe_mail_wall_aside .oe_suggested_item {
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item {
     border-radius: 2px;
     width: 100%;
     margin-left: 10px;
     min-height: 67px;  /* image_small 66x66px */
 }
-.openerp .oe_mail_wall_aside .oe_item_image {
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image {
     float: left;
     padding-right: 10px;
 }
-.openerp .oe_mail_wall_aside .oe_item_image_content {
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image img {
     border-radius: 2px;
     border: solid 1px rgba(0,0,0,0.03);
 }
-.openerp .oe_mail_wall_aside .oe_suggestion_action {
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content button {
     margin-top: 10px;
 }
-.openerp .oe_mail_wall_aside .oe_remove_suggested_item,
-.openerp .oe_mail_wall_aside .oe_remove_suggestion {
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_item_name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    width: 90%;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_title a.oe_suggestion_remove {
+    line-height: 15px;
+    margin-top: -2px;
+    float: right;
     visibility: hidden;
-    width: 3%;
+    margin-right: 7px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_remove_item {
+    line-height: 15px;
+    margin-top: -2px;
     float: right;
-    margin-right: 10px;
+    visibility: hidden;
+    margin-right: 16px;
 }
-.openerp .oe_mail_wall_aside .oe_suggested_item:hover .oe_remove_suggested_item > span,
-.openerp .oe_mail_wall_aside .oe_suggestion_display:hover .oe_remove_suggestion > span {
+.openerp .oe_sidebar_suggestion .oe_suggest_title:hover a.oe_suggestion_remove,
+.openerp .oe_sidebar_suggestion .oe_suggest_items:hover a.oe_suggestion_remove_item {
     visibility: visible;
 }
-.openerp .oe_mail_wall_aside .oe_item,.oe_suggestion_display {
-    width: 90%;
-}
-.openerp .oe_mail_wall_aside .oe_item .oe_item_name {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    width: 90%;
-}
\ 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 fe298b3ac65..b8720e8f1c7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -4,9 +4,8 @@ openerp.mail = function (session) {
 
     var mail = session.mail = {};
 
-    openerp_mail_followers(session, mail);        // import mail_followers.js
-    openerp_FieldMany2ManyTagsEmail(session);      // import manyy2many_tags_email.js
-    
+    openerp_mail_followers(session, mail);          // import mail_followers.js
+    openerp_FieldMany2ManyTagsEmail(session);       // import manyy2many_tags_email.js
 
     /**
      * ------------------------------------------------------------
@@ -1818,6 +1817,19 @@ openerp.mail = function (session) {
     });
 
 
+    /**
+     * ------------------------------------------------------------
+     * Aside Widget
+     * ------------------------------------------------------------
+     * 
+     * This widget handles the display of a sidebar on the Wall. Its main use
+     * is to display group and employees suggestion (if hr is installed).
+     */
+    mail.WallSidebar = session.web.Widget.extend({
+        template: 'mail.wall.sidebar',
+    });
+
+
     /**
      * ------------------------------------------------------------
      * Wall Widget
@@ -1871,6 +1883,9 @@ openerp.mail = function (session) {
             if (! this.searchview.has_defaults) {
                 this.message_render();
             }
+            // render sidebar
+            var wall_sidebar = new mail.WallSidebar(this);
+            wall_sidebar.appendTo(this.$el.find('.oe_mail_wall_aside'));
         },
 
         /**
@@ -2006,5 +2021,15 @@ openerp.mail = function (session) {
         },
     });
 
-    openerp.mail.suggestions(session, mail);
+
+    /**
+     * ------------------------------------------------------------
+     * Sub-widgets loading
+     * ------------------------------------------------------------
+     * 
+     * Load here widgets that could depend on widgets defined in mail.js
+     */
+
+    openerp.mail.suggestions(session, mail);        // import suggestion.js (suggestion widget)
+
 };
diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
index 205f8b2f27d..4d0fcec32bf 100644
--- a/addons/mail/static/src/js/suggestions.js
+++ b/addons/mail/static/src/js/suggestions.js
@@ -3,99 +3,75 @@ openerp.mail.suggestions = function(session, mail) {
     var QWeb = session.web.qweb;
 
     var suggestions = session.suggestions = {};
+    var removed_suggested_group = session.suggestions.removed_suggested_group = [];
 
-    suggestions.Sidebar = session.web.Widget.extend({
-        template: "mail.suggestions",
-        init: function (parent, action) {
-            var self = this;
-            this._super(parent, action);
-            this.res_user = new session.web.DataSetSearch(this, 'res.users');
-        }
-    });
-
-    var removed_suggested_group = session.removed_suggested_group = [];
     suggestions.Groups = session.web.Widget.extend({
         events: {
-            'click .oe_remove_suggestion_groups': "remove_suggestion_groups",
-            'click .oe_remove_suggested_group': "remove_suggested_group",
-            'click .oe_join_group': "join_group",
-            'click .oe_open_group': "open_group"
+            'click .oe_suggestion_remove.oe_suggestion_group': 'stop_group_suggestion',
+            'click .oe_suggestion_remove_item.oe_suggestion_group': 'remove_group_suggestion',
+            'click .oe_suggestion_join': 'join_group',
         },
-        init: function (parent, action) {
-            var self = this;
-            this._super(parent, action);
-            this.deferred = $.Deferred();
+
+        init: function () {
+            this._super.apply(this, arguments);
             this.mail_group = new session.web.DataSetSearch(this, 'mail.group');
             this.res_users = new session.web.DataSetSearch(this, 'res.users');
-            this.suggestions = [];
+            this.groups = [];
         },
-        start: function() {
-            var self = this;
-            var res = self.get_suggested_group();
-            return $.when(res).done(function() {});
+
+        start: function () {
+            this._super.apply(this, arguments);
+            return this.fetch_suggested_groups();
         },
-        get_suggested_group: function () {
+
+        fetch_suggested_groups: function () {
             var self = this;
-            var group = self.mail_group.call('get_suggested_thread', {'removed_suggested_threads':removed_suggested_group}).then(function(res) {
-                _(res).each(function(result) {
+            var group = self.mail_group.call('get_suggested_thread', {'removed_suggested_threads': removed_suggested_group}).then(function (res) {
+                _(res).each(function (result) {
                     result['image']=self.session.url('/web/binary/image', {model: 'mail.group', field: 'image_small', id: result.id});
                 });
-
-                self.suggestions = res;
-            });
-            return $.when(group).done(function() {
-                self.$el.html( QWeb.render("mail.suggestions.groups", {'widget': self}) );
-                if (self.suggestions.length === 0) {
-                    self.$(".oe_sidebar_group").hide();
-                }
+                self.groups = res;
             });
+            return $.when(group).then(this.proxy('display_suggested_groups'));
         },
-        open_group:function(event) {
-            var self = this;
-            var id = JSON.parse($(event.currentTarget).attr("id"));
-            action = {
-                type: 'ir.actions.act_window',
-                res_model: 'mail.group',
-                res_id: id,
-                views: [[false, 'form']],
-                target: 'current'
-            };
-            this.do_action(action);
+
+        display_suggested_groups: function () {
+            var suggested_groups = this.$('.oe_sidebar_suggestion.oe_suggestion_group');
+            if (suggested_groups) {
+                suggested_groups.empty();
+            }
+            if (this.groups.length === 0) {
+                return this.$el.empty();
+            }
+            return this.$el.empty().html(QWeb.render('mail.suggestions.groups', {'widget': this}));
         },
-        join_group:function(event) {
+
+        join_group: function (event) {
             var self = this;
             return this.mail_group.call('message_subscribe_users', [[$(event.currentTarget).attr('id')],[this.session.uid]]).then(function(res) {
-                self.get_suggested_group();
+                self.fetch_suggested_groups();
             });
         },
-        remove_suggested_group: function(event) {
-            var self = this;
+
+        remove_group_suggestion: function (event) {
             removed_suggested_group.push($(event.currentTarget).attr('id'));
-            self.get_suggested_group();
+            return this.fetch_suggested_groups();
         },
-        remove_suggestion_groups: function(event) {
+
+        stop_group_suggestion: function (event) {
             var self = this;
             return this.res_users.call('stop_showing_groups_suggestions', [this.session.uid]).then(function(res) {
-                self.$(".oe_sidebar_group").hide();
+                self.$(".oe_sidebar_suggestion.oe_suggestion_group").hide();
             });
         }
     });
 
-    mail.Wall.include({
-        start: function(options) {
-            this._super(options);
-            var self = this;
-            var sidebar = new suggestions.Sidebar(self);
-            sidebar.appendTo(self.$el.find('.oe_mail_wall_aside'));
-
-            var sug_groups = new suggestions.Groups(self);
-            // sug_groups.replace(self.$el.find('.oe_suggestions_groups'));
-            $.when(sug_groups.start()).done(function() {
-                //self.$el.find('.oe_suggestions_groups').html(sug_groups.$el.html());
-                sug_groups.replace( self.$el.find('.oe_suggestions_groups') );
-            });
-
-        }
+    session.mail.WallSidebar.include({
+        start: function () {
+            this._super.apply(this, arguments);
+            var sug_groups = new suggestions.Groups(this);
+            return sug_groups.appendTo(this.$('.oe_suggestions_groups'));
+        },
     });
 
 };
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cfbe57aa1b6..d0f975e84d7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -198,6 +198,13 @@
         <aside class="oe_mail_wall_aside"></aside>
     </div>
 
+    <!--
+        Empty template that holds the sidebar of the Wall
+        -->
+    <t t-name="mail.wall.sidebar">
+        <div class="oe_mail_wall_sidebar"></div>
+    </t>
+
     <!--
         display message on the wall when there are no message
         -->
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
index f868194ded6..9157dcbe32e 100644
--- a/addons/mail/static/src/xml/suggestions.xml
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <t t-name="mail.suggestions">
-        <div class="oe_suggestions_groups"></div>
+    <!-- Groups placeholder in sidebar -->
+    <t t-extend="mail.wall.sidebar">
+        <t t-jquery=".oe_mail_wall_sidebar" t-operation="append">
+            <div class="oe_suggestions_groups"></div>
+        </t>
     </t>
 
+
     <!-- Suggested groups -->
-    <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_sidebar_group">
-        <p class="oe_suggestion_display">
-            Suggested Groups
-            <a class="oe_remove_suggestion oe_remove_suggestion_groups" rol="button">
-                <span class="oe_kanban_action oe_kanban_action_a">X</span>
-            </a>
-        </p>
-        <div class="oe_suggest_groups">
-            <t t-foreach="widget.suggestions" t-as="result">
+    <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_suggestion_group">
+        <div class="oe_suggest_title">
+            <a class="oe_suggestion_remove oe_suggestion_group oe_e">X</a>
+            <h2>Suggested Groups</h2>
+        </div>
+        <div class="oe_suggest_items">
+            <t t-foreach="widget.groups" t-as="result">
                 <div class="oe_suggested_item">
-                    <div class="oe_item_image">
-                        <img class="oe_item_image_content oe_open_group" t-attf-src="{result.image}" t-attf-id="{result.id}"/>
-                    </div>
-                    <div class="oe_item">
-                        <a class="oe_item_name oe_open_group" t-attf-id="{result.id}">
-                            <t t-esc="result.name"/>
-                        </a>
-                        <a class="oe_remove_suggested_item oe_remove_suggested_group" rol="button" t-attf-id="{result.id}">
-                            <span class="oe_kanban_action oe_kanban_action_a">X</span>
+                    <div class="oe_suggested_item_image">
+                        <a t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                            <img t-attf-src="{result.image}" t-attf-alt="{result.name}"/>
                         </a>
+                    </div>
+                    <div class="oe_suggested_item_content">
+                        <a class="oe_suggestion_item_name" t-attf-href="#model=mail.group&amp;id=#{result.id}"><t t-esc="result.name"/></a>
+                        <a class="oe_suggestion_remove_item oe_suggestion_group oe_e" t-attf-id="{result.id}">X</a>
                         <br/>
-                        <button t-att-id="result.id" class="oe_suggestion_action oe_join_group">Join Group</button>
+                        <button t-att-id="result.id" class="oe_suggestion_join">Join Group</button>
                     </div>
                 </div>
             </t>
-- 
cgit v1.2.3


From 89896f32bbf6aeecfbddc0f7e8397781fce2a99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 15 May 2013 17:31:59 +0200
Subject: [IMP] [CLEAN] [REF] mail, res_partner, res_users, hr: cleaned partner
 / employee profile following last specifications. Partner profile is now
 classic, no more email-routing. Writing on res.users, basically, begins a
 private discussion. With HR, emails on res.users are private discussions,
 other are post on employee profile. Some cleaning in Chatter about Followers
 of ... , now talking about partner or employee profile.

bzr revid: tde@openerp.com-20130515153159-cm52byvb7w6m1sxs
---
 addons/mail/static/src/js/mail.js   | 9 ++++++++-
 addons/mail/static/src/xml/mail.xml | 8 +++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b8720e8f1c7..3338954d417 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -236,8 +236,15 @@ openerp.mail = function (session) {
 
             this.format_data();
 
+            // update record_name: Partner profile
+            if (this.model == 'res.partner') {
+                this.record_name = 'Partner Profile of ' + this.record_name;
+            }
+            else if (this.model == 'hr.employee') {
+                this.record_name = 'News from ' + this.record_name;
+            }
             // record options and data
-            this.show_record_name = this.options.show_record_name && this.record_name && !this.thread_level && this.model != 'res.partner';
+            this.show_record_name = this.options.show_record_name && this.record_name && !this.thread_level;
             this.options.show_read = false;
             this.options.show_unread = false;
             if (this.options.show_read_unread_button) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d0f975e84d7..1ee1af68fff 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -121,9 +121,11 @@
             To:
             <t t-if="!widget.is_private">
                 <span class="oe_all_follower">
-                    Followers of
-                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
-                    <t t-if="!widget.parent_thread.parent_message.record_name">this document</t>
+                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'">
+                        Followers of <t t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
+                    </t>
+                    <t t-if="!widget.parent_thread.parent_message.record_name and widget.options.view_inbox">My Followers</t>
+                    <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
             <t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
-- 
cgit v1.2.3


From c4a019bbfddd27a46a780af5f1506e4364e2d28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 May 2013 12:54:34 +0200
Subject: [CLEAN] mail: added CSS from web to mail module.

bzr revid: tde@openerp.com-20130522105434-nqmao3fyxy8on1rl
---
 addons/mail/static/src/css/mail.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6bc086a5b58..b31210a45e8 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -26,6 +26,16 @@
     border-radius: 0px;
 }
 
+/* ---- GENERIC FOR MAIL-RELATED STUFF ---- */
+.openerp .oe_e.oe_e_alias {
+  font-size: 30px;
+  line-height: 15px;
+  vertical-align: top;
+  margin-right: 3px;
+  color: white;
+  text-shadow: 0px 0px 2px black;
+}
+
 /* ------------ MAIL WIDGET --------------- */
 .openerp .oe_mail, .openerp .oe_mail *{
     -webkit-box-sizing: border-box;
-- 
cgit v1.2.3


From c61329943a702f88003bf4001806f3f23f744a89 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 27 May 2013 14:18:23 +0200
Subject: [IMP] mail: add breadcrumb from inbox

bzr revid: chm@openerp.com-20130527121823-tfjevhu5zl5at4ar
---
 addons/mail/static/src/js/mail.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 21b0f5a9a87..5d54a6acc48 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -967,6 +967,24 @@ openerp.mail = function (session) {
             this.$('.oe_reply').on('click', this.on_message_reply);
             this.$('.oe_star').on('click', this.on_star);
             this.$('.oe_msg_vote').on('click', this.on_vote);
+            this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
+        },
+
+        on_record_clicked: function  (event) {
+            event.stopPropagation();
+            var state = {
+                'model': this.model,
+                'id': this.res_id,
+                'title': this.record_name
+            };
+            session.webclient.action_manager.do_push_state(state);
+            this.do_action({
+                res_model: state.model,
+                res_id: state.id,
+                type: 'ir.actions.act_window',
+                views: [[false, 'form']]
+            });
+            return false;
         },
 
         /* Call the on_compose_message on the thread of this message. */
-- 
cgit v1.2.3


From 133ad0b97c0029e5902a836d821112b4928c465c Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 30 May 2013 10:10:37 +0530
Subject: [IMP] Improved code for removing the div of dialog everytime when the
 dialog box is created.

bzr revid: psa@tinyerp.com-20130530044037-02cw9gap03qhz087
---
 addons/mail/static/src/js/mail_followers.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 7a4052e123b..d40f135d7db 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -82,6 +82,7 @@ openerp_mail_followers = function(session, mail) {
         on_edit_subtype: function(event) {
             var self = this;
             var partner_id = $(event.target).data('id');
+            $('div.oe_edit_actions').remove();
             self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
                             modal: true,
                             width: 'auto',
-- 
cgit v1.2.3


From 872a688fbe4fba647f51169f2d3fe7d8715974fd Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 3 Jun 2013 18:02:27 +0530
Subject: [IMP] Added code for the access right on specific model.

bzr revid: psa@tinyerp.com-20130603123227-76kykft5jl3u5egl
---
 addons/mail/static/src/js/mail_followers.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index d40f135d7db..c43b557e982 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -91,9 +91,9 @@ openerp_mail_followers = function(session, mail) {
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
                                         self.do_update_subscription(event, partner_id);
-                                        $(this).remove();
+                                        $(this).dialog("close");
                                     }},
-                                    { text: _t("Cancel"), click: function() { $(this).remove(); }}
+                                    { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
                                 ],
                     });
              return self.fetch_subtypes(partner_id);
@@ -291,6 +291,7 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
 
             var checklist = new Array();
+            this.ds_model.call('check_access_rights', ['write','read'])
             var subtype_checkbox = _(this.$('.oe_actions input[type="checkbox"]'))
              if (partner_id) {
                 subtype_checkbox = _($('.oe_edit_actions input[type="checkbox"]'))
-- 
cgit v1.2.3


From 388a3e14a15c9d18cc179cee0779a07e45424b82 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 4 Jun 2013 15:17:22 +0530
Subject: [ImP] method name change and removed the access call which is not
 needed bcz the system is calling it self.

bzr revid: psa@tinyerp.com-20130604094722-2b8i6ba7blz1g2rc
---
 addons/mail/static/src/js/mail_followers.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index c43b557e982..74a59d5abba 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -198,7 +198,7 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){
+                self.ds_model.call('check_technical_rights', [self.session.uid]).then(function(result){
                     self.check_access = result;
                     record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                     $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
@@ -291,7 +291,6 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
 
             var checklist = new Array();
-            this.ds_model.call('check_access_rights', ['write','read'])
             var subtype_checkbox = _(this.$('.oe_actions input[type="checkbox"]'))
              if (partner_id) {
                 subtype_checkbox = _($('.oe_edit_actions input[type="checkbox"]'))
-- 
cgit v1.2.3


From 9fd2e7297ffb0fe9cb96767bcb8ad686a66d064b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 5 Jun 2013 12:13:00 +0200
Subject: [IMP] Chatter: better display of date

bzr revid: tde@openerp.com-20130605101300-t1lwykg3d6lp7au2
---
 addons/mail/static/src/js/mail.js   | 1 +
 addons/mail/static/src/xml/mail.xml | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2cd9c7c077d..70e93e2957c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -259,6 +259,7 @@ openerp.mail = function (session) {
         format_data: function () {
             //formating and add some fields for render
             this.date = this.date ? session.web.str_to_datetime(this.date) : false;
+            this.display_date = this.date.toString('ddd MMM dd yyyy HH:mm');
             if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
                 this.timerelative = $.timeago(this.date);
             }
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f5004941a8d..b3b79bcfc43 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -295,7 +295,10 @@
                         notified
                     </t>
                     <span class='oe_subtle'>•</span>
-                    <span t-att-title="widget.date"><t t-if="widget.timerelative" t-raw="widget.timerelative"/><t t-if="!widget.timerelative" t-raw="widget.date"/></span>
+                    <span t-att-title="widget.date">
+                        <t t-if="widget.timerelative" t-raw="widget.timerelative"/>
+                        <t t-if="!widget.timerelative" t-raw="widget.display_date"/>
+                    </span>
                     <span t-if="!widget.options.readonly" class='oe_subtle'>•</span>
                     <t t-if="!widget.options.readonly" t-call="mail.thread.message.vote"/>
                 </div>
-- 
cgit v1.2.3


From 52b02c879b0e2b23194f6c08fc30e38a22b42c4a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 5 Jun 2013 18:40:31 +0530
Subject: [IMP] Improved code without disturbing the others methods and solved
 the issue of unfollowing the specific user by specific id.

bzr revid: psa@tinyerp.com-20130605131031-bppkpzdwmi8sp4f7
---
 addons/mail/static/src/js/mail_followers.js | 46 ++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 74a59d5abba..8b4f044740d 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -81,7 +81,7 @@ openerp_mail_followers = function(session, mail) {
 
         on_edit_subtype: function(event) {
             var self = this;
-            var partner_id = $(event.target).data('id');
+            var user_pid = $(event.target).data('id');
             $('div.oe_edit_actions').remove();
             self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
                             modal: true,
@@ -90,13 +90,13 @@ openerp_mail_followers = function(session, mail) {
                             title: _t('Edit Subscription of ') + $(event.target).siblings('a').text(),
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
-                                        self.do_update_subscription(event, partner_id);
+                                        self.do_update_subscription(event, user_pid);
                                         $(this).dialog("close");
                                     }},
                                     { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
                                 ],
                     });
-             return self.fetch_subtypes(partner_id);
+             return self.fetch_subtypes(user_pid);
         },
 
         on_invite_follower: function (event) {
@@ -231,17 +231,17 @@ openerp_mail_followers = function(session, mail) {
         },
 
         /** Fetch subtypes, only if current user is follower */
-        fetch_subtypes: function (partner_id) {
+        fetch_subtypes: function (user_pid) {
             var self = this;
             var mode = "";
-            if (partner_id) {
+            if (user_pid) {
                 mode = "edit_follower";
             } else {
                 var subtype_list_ul = this.$('.oe_subtype_list').empty();
                 if (! this.message_is_follower) return;
             }
             var id = this.view.datarecord.id;
-            this.ds_model.call('message_get_subscription_data', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
+            this.ds_model.call('message_get_subscription_data', [[id], user_pid, new session.web.CompoundContext(this.build_context(), {})])
                 .then(function (data) {self.display_subtypes(data, id, mode);});
         },
 
@@ -267,7 +267,7 @@ openerp_mail_followers = function(session, mail) {
 
         do_follow: function () {
             var context = new session.web.CompoundContext(this.build_context(), {});
-            this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, undefined, context])
+            this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context])
                 .then(this.proxy('read_value'));
 
             _.each(this.$('.oe_subtype_list input'), function (record) {
@@ -275,39 +275,49 @@ openerp_mail_followers = function(session, mail) {
             });
         },
         
-        do_unfollow: function () {
+        do_unfollow: function (user_pid) {
             if (confirm(_t("Warning! \nYou won't be notified of any email or discussion on this document. Do you really want to unfollow this document ?"))) {
                 _(this.$('.oe_msg_subtype_check')).each(function (record) {
                     $(record).attr('checked',false);
                 });
+            var unsubscribe = 'message_unsubscribe_users';
+            var follower_ids = [this.session.uid];
+            if (user_pid) {
+                unsubscribe = 'message_unsubscribe';
+                follower_ids = [user_pid];
+            }
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], [this.session.uid], context])
-                    .then(this.proxy('read_value'));
+                return this.ds_model.call(unsubscribe, [[this.view.datarecord.id], follower_ids, context])
+                     .then(this.proxy('read_value'));
             }
             return false;
         },
 
-        do_update_subscription: function (event, partner_id) {
+        do_update_subscription: function (event, user_pid) {
             var self = this;
 
+            var subscribe = 'message_subscribe_users';
+            var follower_ids = [this.session.uid];
+            var oe_action = this.$('.oe_actions input[type="checkbox"]');
+            if (user_pid) {
+                subscribe = 'message_subscribe';
+                follower_ids = [user_pid];
+                oe_action = $('.oe_edit_actions input[type="checkbox"]');
+            }
             var checklist = new Array();
-            var subtype_checkbox = _(this.$('.oe_actions input[type="checkbox"]'))
-             if (partner_id) {
-                subtype_checkbox = _($('.oe_edit_actions input[type="checkbox"]'))
-             }
-            subtype_checkbox.each(function (record) {
+            _(oe_action).each(function (record) {
                 if ($(record).is(':checked')) {
                     checklist.push(parseInt($(record).data('id')));
                 }
             });
 
             if (!checklist.length) {
-                if (!this.do_unfollow()) {
+                if (!this.do_unfollow(user_pid)) {
                     $(event.target).attr("checked", "checked");
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], checklist, partner_id, context])
+                return this.ds_model.call(subscribe, [[this.view.datarecord.id], follower_ids, checklist, context])
                     .then(this.proxy('read_value'));
             }
         },
-- 
cgit v1.2.3


From da775672ea6742a40d5827a30e49761e05868f94 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 6 Jun 2013 11:18:17 +0530
Subject: [IMP] Improved code.

bzr revid: psa@tinyerp.com-20130606054817-k3bbkb4j1u9rolpi
---
 addons/mail/static/src/js/mail_followers.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 8b4f044740d..6394ccf27c8 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -249,16 +249,13 @@ openerp_mail_followers = function(session, mail) {
         display_subtypes:function (data, id, mode) {
             var self = this;
             var $list = this.$('.oe_subtype_list');
-            if (mode.length == 0){ $list.empty().hide();}
+            if (mode.length != 0){ $list = self.$dialog; }
+            $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                if (mode.length == 0) {
-                    $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( self.$('.oe_subtype_list') );
-                } else {
-                    $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo(self.$dialog);
-                }
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( $list );
             });
             if (_.size(records) > 1) {
                 $list.show();
-- 
cgit v1.2.3


From 9c57f6e1cdaf8a80a403486b51cd9e661c11e3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Jun 2013 12:24:37 +0200
Subject: [FIX] mail: various fixes Mass mailing: emails due to mass mailing
 are not queued instead of sent immediately. As most of cases go through
 mail_followers._notify(), a new argument is added that allows to control the
 force_send (like what is done in email_template). Chatter: better display of
 recipients when having a message_post due to mass mailing (not always
 displaying logged a note). Notified people: when having no subtype, just
 avoid notifying the followers but take into account specified recipients
 (partner_ids).

bzr revid: tde@openerp.com-20130606102437-43s4xp96b5wa3r1q
---
 addons/mail/static/src/xml/mail.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b3b79bcfc43..8c507925359 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -271,16 +271,16 @@
                             <span class='oe_subtle'>•</span>
                         </t>
                     </t>
-                    <t t-if="widget.type == 'comment' and ! widget.subtype">
+                    <t t-if="widget.type == 'comment' and ! widget.subtype and widget.partner_ids.length == 0">
                         logged a note
                     </t>
-                    <t t-if="(widget.type == 'comment' or widget.type == 'email') and widget.subtype">
+                    <t t-if="(widget.type == 'comment' or widget.type == 'email') and (widget.subtype or widget.partner_ids.length > 0)">
                         to
                         <t t-if="widget.partner_ids.length == 0">
                             nobody
                         </t>
                     </t>
-                    <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and widget.subtype)"
+                    <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and (widget.subtype or widget.partner_ids.length > 0))"
                             t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner">
                         <span t-attf-class="oe_partner_follower">
                         <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
-- 
cgit v1.2.3


From 52379022dbd3857fef51c6ce03b83c909707901c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 6 Jun 2013 18:18:37 +0200
Subject: [FIX] OPW 586673: mail: make `read more/less` labels translatable

lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130606161837-1loqbdr269cr1udl
---
 addons/mail/static/src/js/mail.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1e58dc47e22..2f6cfbdd708 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -975,8 +975,8 @@ openerp.mail = function (session) {
         expender: function () {
             this.$('.oe_msg_body:first').expander({
                 slicePoint: this.options.truncate_limit,
-                expandText: 'read more',
-                userCollapseText: 'read less',
+                expandText: _t('read more'),
+                userCollapseText: _t('read less'),
                 detailClass: 'oe_msg_tail',
                 moreClass: 'oe_mail_expand',
                 lessClass: 'oe_mail_reduce',
-- 
cgit v1.2.3


From b2ce2ae9bc4724a2bf5dba414d6e86c7042768d3 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 12 Jun 2013 10:56:45 +0530
Subject: [IMP] variable name improvements added action_ ahead of subscribe and
 unsubscribe to clearly understad the work of it.

bzr revid: psa@tinyerp.com-20130612052645-x1wv4e1t2zyig4t2
---
 addons/mail/static/src/js/mail_followers.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 2f010d6812b..faab16947d5 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -280,14 +280,14 @@ openerp_mail_followers = function(session, mail) {
                 _(this.$('.oe_msg_subtype_check')).each(function (record) {
                     $(record).attr('checked',false);
                 });
-            var unsubscribe = 'message_unsubscribe_users';
+            var action_unsubscribe = 'message_unsubscribe_users';
             var follower_ids = [this.session.uid];
             if (user_pid) {
-                unsubscribe = 'message_unsubscribe';
+                action_unsubscribe = 'message_unsubscribe';
                 follower_ids = [user_pid];
             }
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call(unsubscribe, [[this.view.datarecord.id], follower_ids, context])
+                return this.ds_model.call(action_unsubscribe, [[this.view.datarecord.id], follower_ids, context])
                      .then(this.proxy('read_value'));
             }
             return false;
@@ -296,11 +296,11 @@ openerp_mail_followers = function(session, mail) {
         do_update_subscription: function (event, user_pid) {
             var self = this;
 
-            var subscribe = 'message_subscribe_users';
+            var action_subscribe = 'message_subscribe_users';
             var follower_ids = [this.session.uid];
             var oe_action = this.$('.oe_actions input[type="checkbox"]');
             if (user_pid) {
-                subscribe = 'message_subscribe';
+                action_subscribe = 'message_subscribe';
                 follower_ids = [user_pid];
                 oe_action = $('.oe_edit_actions input[type="checkbox"]');
             }
@@ -317,7 +317,7 @@ openerp_mail_followers = function(session, mail) {
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call(subscribe, [[this.view.datarecord.id], follower_ids, checklist, context])
+                return this.ds_model.call(action_subscribe, [[this.view.datarecord.id], follower_ids, checklist, context])
                     .then(this.proxy('read_value'));
             }
         },
-- 
cgit v1.2.3


From 7d2344bc36740a98708bb58abc4c404a41031481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Jun 2013 11:59:44 +0200
Subject: [FIX] Chatter: fixed avatar management as this should be fixed in
 trunk

bzr revid: tde@openerp.com-20130612095944-2aa2mezzbb47uk6g
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 230655cd364..0bc24ac4264 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -275,7 +275,7 @@ openerp.mail = function (session) {
             } else if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
                 this.avatar = ('/mail/static/src/img/email_icon.png');
             } else if (this.author_id && this.template != 'mail.compose_message') {
-                this.avatar = mail.ChatterUtils.get_image(this.session, 'mail.message', 'image_small', this.id);
+                this.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', this.author_id[0]);
             } else {
                 this.avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             }
-- 
cgit v1.2.3


From 14f157e395304c288e116e1759fdaf74128d8877 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 12 Jun 2013 17:15:38 +0530
Subject: [IMP] When the subtypes are not displayed in subtype list below the
 follow button than the edit subtype pencil will also not displayed.

bzr revid: psa@tinyerp.com-20130612114538-21ohwb0l50or62fe
---
 addons/mail/static/src/js/mail_followers.js   | 2 ++
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index faab16947d5..6bcc0bb2a4e 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -252,6 +252,8 @@ openerp_mail_followers = function(session, mail) {
             if (mode.length != 0){ $list = self.$dialog; }
             $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
+            this.records_length = $.map(records, function(value, index) { return index; }).length;
+            if (this.records_length > 1) { self.display_followers(); }
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 876cead3b50..0693b7c9532 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug and widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug and widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From ae8302a3d6108d305c38190214b348a5e6715b7f Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 19 Jun 2013 19:18:17 +0530
Subject: [IMP] Now the edit_subtype pencil will be visible when the cursor
 goes on to the follower_list. And made the edit_subtype icon visible without
 debug mode.

bzr revid: psa@tinyerp.com-20130619134817-n390r4dsgmpo33nb
---
 addons/mail/static/src/css/mail.css           | 6 ++++++
 addons/mail/static/src/js/mail_followers.js   | 9 +++++++++
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d976ce05f38..d5c1ffeedc7 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -628,6 +628,9 @@
     text-overflow: ellipsis;
     margin-right: 10px;
 }
+.openerp .oe_followers .oe_partner_name {
+    margin-right: 26px;
+}
 .openerp .oe_followers .oe_partner img{
     width: 32px;
     margin-right:4px;
@@ -647,6 +650,9 @@
     width: 10px !important;
     height: 12px !important;
 }
+img.hidden {
+    display: none;
+}
 .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
     padding-right: 20px;
 }
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 6bcc0bb2a4e..24dadec25ab 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -195,6 +195,15 @@ openerp_mail_followers = function(session, mail) {
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
+            // On mouseenter it will show the edit_subtype penil
+            this.$el.on('mouseenter', 'div.oe_follower_list', function() {
+                $("img.oe_edit_subtype").removeClass("hidden");
+                $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
+            }).on('mouseleave', 'div.oe_follower_list', function(){
+                $("img.oe_edit_subtype").addClass("hidden");
+                $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
+            });
+
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 0693b7c9532..db58abb1441 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug and widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
-- 
cgit v1.2.3


From 4180da8a406acc8a55c329e6d90e4df377aba170 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 20 Jun 2013 10:30:26 +0530
Subject: [IMP] Improved code and removed unwanted code.

bzr revid: psa@tinyerp.com-20130620050026-3kwfmowqfa9f4quz
---
 addons/mail/static/src/css/mail.css         |  2 +-
 addons/mail/static/src/js/mail_followers.js | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d5c1ffeedc7..4d46319a490 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -650,7 +650,7 @@
     width: 10px !important;
     height: 12px !important;
 }
-img.hidden {
+.openerp .oe_followers .oe_partner img.hidden{
     display: none;
 }
 .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 24dadec25ab..351031b9711 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -195,14 +195,6 @@ openerp_mail_followers = function(session, mail) {
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
-            // On mouseenter it will show the edit_subtype penil
-            this.$el.on('mouseenter', 'div.oe_follower_list', function() {
-                $("img.oe_edit_subtype").removeClass("hidden");
-                $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
-            }).on('mouseleave', 'div.oe_follower_list', function(){
-                $("img.oe_edit_subtype").addClass("hidden");
-                $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
-            });
 
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
@@ -211,6 +203,16 @@ openerp_mail_followers = function(session, mail) {
                     self.check_access = result;
                     record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                     $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                    // On mouseenter it will show the edit_subtype penil
+                    if (self.check_access == true) {
+                        self.$el.on('mouseenter', 'div.oe_follower_list', function() {
+                            $("img.oe_edit_subtype").removeClass("hidden");
+                            $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
+                        }).on('mouseleave', 'div.oe_follower_list', function(){
+                            $("img.oe_edit_subtype").addClass("hidden");
+                            $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
+                        });
+                    }
               })
             });
             // FVA note: be sure it is correctly translated
@@ -271,9 +273,6 @@ openerp_mail_followers = function(session, mail) {
             if (_.size(records) > 1) {
                 $list.show();
             }
-            if (this.check_access && this.session.debug) {
-                $('div.oe_follower_list').find('.oe_partner').css('margin-right', '28px');
-            }
         },
 
         do_follow: function () {
-- 
cgit v1.2.3


From cc05ab11dfd7e2070d2af9642808de34ec031add Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 26 Jun 2013 16:17:22 +0530
Subject: [IMP] Little Improvement.

bzr revid: psa@tinyerp.com-20130626104722-jpzcu0gnbbggitv8
---
 addons/mail/static/src/js/mail_followers.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index eafbb3ac4e1..b7862564732 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -74,6 +74,7 @@ openerp_mail_followers = function(session, mail) {
             this.$el.on('click', '.oe_subtype_list input', self.do_update_subscription);
             // event: click on 'invite' button, that opens the invite wizard
             this.$('.oe_invite').on('click', self.on_invite_follower);
+            // event: click on 'edit_subtype(pencil)' button to edit subscription
             this.$el.on('click', '.oe_edit_subtype', self.on_edit_subtype);
             this.$el.on('click', '.oe_remove_follower', self.on_remove_follower);
             this.$el.on('click', '.oe_show_more', self.on_show_more_followers)
@@ -81,13 +82,14 @@ openerp_mail_followers = function(session, mail) {
 
         on_edit_subtype: function(event) {
             var self = this;
-            var user_pid = $(event.target).data('id');
+            var $currentTarget = $(event.currentTarget);
+            var user_pid = $currentTarget.data('id');
             $('div.oe_edit_actions').remove();
             self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
                             modal: true,
                             width: 'auto',
                             height: 'auto',
-                            title: _t('Edit Subscription of ') + $(event.target).siblings('a').text(),
+                            title: _t('Edit Subscription of ') + $currentTarget.siblings('a').text(),
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
                                         self.do_update_subscription(event, user_pid);
@@ -96,7 +98,7 @@ openerp_mail_followers = function(session, mail) {
                                     { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
                                 ],
                     });
-             return self.fetch_subtypes(user_pid);
+            return self.fetch_subtypes(user_pid);
         },
 
         on_invite_follower: function (event) {
-- 
cgit v1.2.3


From fc70550ca2a8d34c07b05b465f342f6248da10ed Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 28 Jun 2013 12:04:41 +0200
Subject: [IMP] move html module description and icon

bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
---
 addons/mail/static/src/img/icon.png | Bin 5754 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 addons/mail/static/src/img/icon.png

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/img/icon.png b/addons/mail/static/src/img/icon.png
deleted file mode 100644
index 53ccc469127..00000000000
Binary files a/addons/mail/static/src/img/icon.png and /dev/null differ
-- 
cgit v1.2.3


From 39151ca2af306adb202394c54fffba26d2e53d40 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 28 Jun 2013 19:07:12 +0530
Subject: [IMP] Improved code for the followers which are visually duplicated
 when you click on a follower's name and get back to the sales order form.

bzr revid: psa@tinyerp.com-20130628133712-tcfoaisr3o9wdv7x
---
 addons/mail/static/src/js/mail_followers.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index b7862564732..260ff6092ea 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -36,6 +36,7 @@ openerp_mail_followers = function(session, mail) {
             this.followers = [];
             
             this.view_is_editable = this.__parentedParent.is_action_enabled('edit');
+            this.check_access = false;
         },
 
         start: function() {
@@ -45,6 +46,7 @@ openerp_mail_followers = function(session, mail) {
             this.reinit();
             this.bind_events();
             this._super();
+            this.check_group_tech_feature();
         },
 
         on_check_visibility_mode: function () {
@@ -188,33 +190,36 @@ openerp_mail_followers = function(session, mail) {
             this.$('.oe_follower_title').html(this._format_followers(this.value.length));
         },
 
+        check_group_tech_feature: function(){
+            var self = this;
+            self.ds_model.call('check_technical_rights', [self.session.uid]).then(function(result){
+                self.check_access = result;
+            });
+        },
+
         /** Display the followers */
         display_followers: function (records) {
             var self = this;
             this.followers = records || this.followers;
             this.message_is_follower = this.set_is_follower(this.followers);
-            this.check_access = false;
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.ds_model.call('check_technical_rights', [self.session.uid]).then(function(result){
-                    self.check_access = result;
-                    record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                    $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
-                    // On mouseenter it will show the edit_subtype penil
-                    if (self.check_access == true) {
-                        self.$el.on('mouseenter', 'div.oe_follower_list', function() {
-                            $("img.oe_edit_subtype").removeClass("hidden");
-                            $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
+                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                // On mouseenter it will show the edit_subtype penil
+                if (self.check_access == true) {
+                    self.$el.on('mouseenter', 'div.oe_follower_list', function() {
+                        $("img.oe_edit_subtype").removeClass("hidden");
+                        $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
                         }).on('mouseleave', 'div.oe_follower_list', function(){
                             $("img.oe_edit_subtype").addClass("hidden");
                             $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
                         });
                     }
-              })
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
-- 
cgit v1.2.3


From 6694183dcb7b95947eea4931bc76cc3e2e1dcee8 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 12 Jul 2013 19:09:20 +0530
Subject: [IMP] Improved code and added {'is_editable': True/False, 'is_uid':
 True/False} -- where is_editable will be True if uid is in technical group --
 where is_uid will be True if uid is in partner.user_ids.

bzr revid: psa@tinyerp.com-20130712133920-96l6axns7yynyz9e
---
 addons/mail/static/src/js/mail_followers.js | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 260ff6092ea..99c2a629f5d 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -29,7 +29,6 @@ openerp_mail_followers = function(session, mail) {
             this.displayed_limit = this.node.attrs.displayed_nb || 10;
             this.displayed_nb = this.displayed_limit;
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
-            this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
 
             this.value = [];
@@ -37,6 +36,7 @@ openerp_mail_followers = function(session, mail) {
             
             this.view_is_editable = this.__parentedParent.is_action_enabled('edit');
             this.check_access = false;
+            this.is_follower = false;
         },
 
         start: function() {
@@ -46,7 +46,6 @@ openerp_mail_followers = function(session, mail) {
             this.reinit();
             this.bind_events();
             this._super();
-            this.check_group_tech_feature();
         },
 
         on_check_visibility_mode: function () {
@@ -154,11 +153,14 @@ openerp_mail_followers = function(session, mail) {
         },
 
         fetch_followers: function (value_) {
+            var self = this;
             this.value = value_ || {};
-            return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
-                .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
-                .then(this.proxy('display_buttons'))
-                .then(this.proxy('fetch_subtypes'));
+            return this.ds_model.call('read_followers_data', [this.value]).then(function(result) {
+                self.result = result;
+                self.display_followers(result), self.proxy('fetch_generic');
+                self.display_buttons();
+                self.fetch_subtypes();
+            });
         },
 
         /** Read on res.partner failed: fall back on a generic case
@@ -190,18 +192,16 @@ openerp_mail_followers = function(session, mail) {
             this.$('.oe_follower_title').html(this._format_followers(this.value.length));
         },
 
-        check_group_tech_feature: function(){
-            var self = this;
-            self.ds_model.call('check_technical_rights', [self.session.uid]).then(function(result){
-                self.check_access = result;
-            });
-        },
-
         /** Display the followers */
         display_followers: function (records) {
             var self = this;
             this.followers = records || this.followers;
-            this.message_is_follower = this.set_is_follower(this.followers);
+            _.each(this.result, function (record) {
+                if (self.session.uid == record.user_ids[0]) {
+                    if (record.is_editable == true) { self.check_access = true; }
+                }
+            });
+            this.message_is_follower = this.set_is_follower(this.followers); // self.is_follower
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
@@ -210,7 +210,7 @@ openerp_mail_followers = function(session, mail) {
             _(truncated).each(function (record) {
                 record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
-                // On mouseenter it will show the edit_subtype penil
+                // On mouse-enter it will show the edit_subtype pencil.
                 if (self.check_access == true) {
                     self.$el.on('mouseenter', 'div.oe_follower_list', function() {
                         $("img.oe_edit_subtype").removeClass("hidden");
-- 
cgit v1.2.3


From 670710b88eb596ab9f6e8587de3d43ac133c0e18 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 15 Jul 2013 13:31:06 +0530
Subject: [IMP] Improved code and passed the data according to the format as
 suggest (partner_id, partner_name, {'is_editable': True/False, 'is_uid':
 True/False}) and done changes according this changes.

bzr revid: psa@tinyerp.com-20130715080106-63dbeh3mhgiqppzv
---
 addons/mail/static/src/js/mail_followers.js   | 19 +++----------------
 addons/mail/static/src/xml/mail_followers.xml |  8 ++++----
 2 files changed, 7 insertions(+), 20 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 99c2a629f5d..4fec4ff3fd3 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -35,8 +35,6 @@ openerp_mail_followers = function(session, mail) {
             this.followers = [];
             
             this.view_is_editable = this.__parentedParent.is_action_enabled('edit');
-            this.check_access = false;
-            this.is_follower = false;
         },
 
         start: function() {
@@ -196,22 +194,17 @@ openerp_mail_followers = function(session, mail) {
         display_followers: function (records) {
             var self = this;
             this.followers = records || this.followers;
-            _.each(this.result, function (record) {
-                if (self.session.uid == record.user_ids[0]) {
-                    if (record.is_editable == true) { self.check_access = true; }
-                }
-            });
-            this.message_is_follower = this.set_is_follower(this.followers); // self.is_follower
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                self.message_is_follower = record[2].is_uid;
+                record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
-                if (self.check_access == true) {
+                if (record[2].is_editable == true) {
                     self.$el.on('mouseenter', 'div.oe_follower_list', function() {
                         $("img.oe_edit_subtype").removeClass("hidden");
                         $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
@@ -227,12 +220,6 @@ openerp_mail_followers = function(session, mail) {
             }
         },
 
-        /** Computes whether the current user is in the followers */
-        set_is_follower: function (records) {
-            var user_ids = _.pluck(_.pluck(records, 'user_ids'), 0);
-            return _.indexOf(user_ids, this.session.uid) != -1;
-        },
-
         display_buttons: function () {
             if (this.message_is_follower) {
                 this.$('button.oe_follower').removeClass('oe_notfollow').addClass('oe_following');
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index db58abb1441..d23154096a6 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -29,10 +29,10 @@
         Template used to display a partner following the record
         -->
     <div t-name="mail.followers.partner" class='oe_partner'>
-        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
-        <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
-        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
+        <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
+        <img t-if="record[2].is_editable" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
+        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
     </div>
     
     <!--
-- 
cgit v1.2.3


From 21e3d7cdc49fb2bf700ae8a0baa2d54cb39ac4c4 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 15 Jul 2013 14:19:07 +0530
Subject: [IMP] 2 little improvements when their is no subtype than no
 edit_subtype pencil will be visible and bydefault set the message_is_follower
 to false because when no followers are there than subtypes muzt not be
 visible.

bzr revid: psa@tinyerp.com-20130715084907-nrd2oileuyr30nep
---
 addons/mail/static/src/js/mail_followers.js   | 1 +
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 4fec4ff3fd3..19b001f45a8 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -193,6 +193,7 @@ openerp_mail_followers = function(session, mail) {
         /** Display the followers */
         display_followers: function (records) {
             var self = this;
+            this.message_is_follower = false;
             this.followers = records || this.followers;
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index d23154096a6..7628cdae7da 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
-        <img t-if="record[2].is_editable" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
+        <img t-if="record[2].is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
     </div>
     
-- 
cgit v1.2.3


From 54837802acf9520e4971192f2a5eb3574bf89174 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 15 Jul 2013 17:07:36 +0530
Subject: Improved code.

bzr revid: psa@tinyerp.com-20130715113736-ww4wffkajnwkk961
---
 addons/mail/static/src/js/mail_followers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 19b001f45a8..528459fc058 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -201,7 +201,7 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.message_is_follower = record[2].is_uid;
+                if (record[2].is_uid == true) { self.message_is_follower = record[2].is_uid; }
                 record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
-- 
cgit v1.2.3


From 48dd55b1e8f5ef4708d161425b2648104c767ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 17 Jul 2013 10:59:25 +0200
Subject: [FIX] mail: fixed merge issue, forgottent conflict

bzr revid: tde@openerp.com-20130717085925-l0u2nkvz91wm5kcy
---
 addons/mail/static/src/js/mail.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7339ee6f452..456efa28425 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -967,10 +967,8 @@ openerp.mail = function (session) {
             this.$('.oe_reply').on('click', this.on_message_reply);
             this.$('.oe_star').on('click', this.on_star);
             this.$('.oe_msg_vote').on('click', this.on_vote);
-<<<<<<< TREE
             this.$('.oe_mail_expand').on('click', this.on_expand);
             this.$('.oe_mail_reduce').on('click', this.on_expand);
-=======
             this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
         },
 
@@ -989,7 +987,6 @@ openerp.mail = function (session) {
                 views: [[false, 'form']]
             });
             return false;
->>>>>>> MERGE-SOURCE
         },
 
         /* Call the on_compose_message on the thread of this message. */
-- 
cgit v1.2.3


From b7160bc1cf78636320f993e867ca7cf267600a72 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 17 Jul 2013 18:18:42 +0530
Subject: [IMP] Improved code for fetch_followers and done as was previously &&
 added condition for the record in display_followers so that it never breaks
 && improve the mouse-enter and mouse-leave.

bzr revid: psa@tinyerp.com-20130717124842-vuqct26jy6a7palb
---
 addons/mail/static/src/js/mail_followers.js | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 528459fc058..d40c000f53e 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -151,14 +151,11 @@ openerp_mail_followers = function(session, mail) {
         },
 
         fetch_followers: function (value_) {
-            var self = this;
             this.value = value_ || {};
-            return this.ds_model.call('read_followers_data', [this.value]).then(function(result) {
-                self.result = result;
-                self.display_followers(result), self.proxy('fetch_generic');
-                self.display_buttons();
-                self.fetch_subtypes();
-            });
+            return this.ds_model.call('read_followers_data', [this.value])
+                .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
+                .then(this.proxy('display_buttons'))
+                .then(this.proxy('fetch_subtypes'));
         },
 
         /** Read on res.partner failed: fall back on a generic case
@@ -201,19 +198,17 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
+                if (record.length < 3) { return; }
                 if (record[2].is_uid == true) { self.message_is_follower = record[2].is_uid; }
                 record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
                 if (record[2].is_editable == true) {
-                    self.$el.on('mouseenter', 'div.oe_follower_list', function() {
-                        $("img.oe_edit_subtype").removeClass("hidden");
-                        $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
-                        }).on('mouseleave', 'div.oe_follower_list', function(){
-                            $("img.oe_edit_subtype").addClass("hidden");
-                            $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
-                        });
-                    }
+                    self.$el.find('div.oe_follower_list').on('mouseenter mouseleave', function(e) {
+                        self.$el.find('img.oe_edit_subtype').toggleClass('hidden', e.type == 'mouseleave');
+                        self.$el.find('div.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
+                    });
+                }
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
-- 
cgit v1.2.3


From 68d1c2928fc1d0307726ed4d32555d68c4f330c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Jul 2013 11:55:09 +0200
Subject: [CLEAN] Cleaning befor merging No need to use an image for edition ->
 use webtypo font instead Small code cleaning in js / python

bzr revid: tde@openerp.com-20130723095509-knp45uvmlfmr27v9
---
 addons/mail/static/src/css/mail.css           |  12 ++-----
 addons/mail/static/src/img/icon-edit.gif      | Bin 129 -> 0 bytes
 addons/mail/static/src/js/mail_followers.js   |  43 +++++++++++++++++---------
 addons/mail/static/src/xml/mail_followers.xml |  12 +++----
 4 files changed, 37 insertions(+), 30 deletions(-)
 delete mode 100644 addons/mail/static/src/img/icon-edit.gif

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 2554538a104..c6f7c911f8a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -632,14 +632,10 @@
 }
 .openerp .oe_followers .oe_partner {
     height: 32px;
-    margin-right: 8px;
+    margin-right: 24px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    margin-right: 10px;
-}
-.openerp .oe_followers .oe_partner_name {
-    margin-right: 26px;
 }
 .openerp .oe_followers .oe_partner img{
     width: 32px;
@@ -656,11 +652,9 @@
     cursor: pointer;
     position: absolute;
     right: 12px;
-    margin-top: 6px;
-    width: 10px !important;
-    height: 12px !important;
+    line-height: 20px;
 }
-.openerp .oe_followers .oe_partner img.hidden{
+.openerp .oe_followers .oe_partner .oe_hidden{
     display: none;
 }
 .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
diff --git a/addons/mail/static/src/img/icon-edit.gif b/addons/mail/static/src/img/icon-edit.gif
deleted file mode 100644
index 6e9aa5ef659..00000000000
Binary files a/addons/mail/static/src/img/icon-edit.gif and /dev/null differ
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index d40c000f53e..a0dad1fcdbc 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -169,6 +169,7 @@ openerp_mail_followers = function(session, mail) {
                 self.message_is_follower = (_.indexOf(self.value, pid) != -1);
             }).then(self.proxy('display_generic'));
         },
+
         _format_followers: function(count){
             var str = '';
             if(count <= 0){
@@ -180,6 +181,7 @@ openerp_mail_followers = function(session, mail) {
             }
             return str;
         },
+
         /* Display generic info about follower, for people not having access to res_partner */
         display_generic: function () {
             var self = this;
@@ -198,15 +200,22 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                if (record.length < 3) { return; }
-                if (record[2].is_uid == true) { self.message_is_follower = record[2].is_uid; }
-                record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                partner = {
+                    'id': record[0],
+                    'name': record[1],
+                    'is_uid': record[2]['is_uid'],
+                    'is_editable': record[2]['is_editable'],
+                    'avatar_url': mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]),
+                }
+                if (partner.is_uid) {
+                    self.message_is_follower = partner.is_uid;
+                }
+                $(session.web.qweb.render('mail.followers.partner', {'record': partner, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
-                if (record[2].is_editable == true) {
-                    self.$el.find('div.oe_follower_list').on('mouseenter mouseleave', function(e) {
-                        self.$el.find('img.oe_edit_subtype').toggleClass('hidden', e.type == 'mouseleave');
-                        self.$el.find('div.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
+                if (partner.is_editable) {
+                    self.$('.oe_follower_list').on('mouseenter mouseleave', function(e) {
+                        self.$('.oe_edit_subtype').toggleClass('oe_hidden', e.type == 'mouseleave');
+                        self.$('.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
                     });
                 }
             });
@@ -233,23 +242,27 @@ openerp_mail_followers = function(session, mail) {
         /** Fetch subtypes, only if current user is follower */
         fetch_subtypes: function (user_pid) {
             var self = this;
-            var mode = "";
+            var dialog = false;
             if (user_pid) {
-                mode = "edit_follower";
+                dialog = true;
             } else {
                 var subtype_list_ul = this.$('.oe_subtype_list').empty();
                 if (! this.message_is_follower) return;
             }
             var id = this.view.datarecord.id;
             this.ds_model.call('message_get_subscription_data', [[id], user_pid, new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {self.display_subtypes(data, id, mode);});
+                .then(function (data) {self.display_subtypes(data, id, dialog);});
         },
 
         /** Display subtypes: {'name': default, followed} */
-        display_subtypes:function (data, id, mode) {
+        display_subtypes:function (data, id, dialog) {
             var self = this;
-            var $list = this.$('.oe_subtype_list');
-            if (mode.length != 0){ $list = self.$dialog; }
+            if (dialog) {
+                var $list = self.$dialog;
+            }
+            else {
+                var $list = this.$('.oe_subtype_list');
+            }
             $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
             this.records_length = $.map(records, function(value, index) { return index; }).length;
@@ -257,7 +270,7 @@ openerp_mail_followers = function(session, mail) {
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( $list );
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list);
             });
             if (_.size(records) > 1) {
                 $list.show();
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 7628cdae7da..a936b8237d6 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -29,10 +29,10 @@
         Template used to display a partner following the record
         -->
     <div t-name="mail.followers.partner" class='oe_partner'>
-        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
-        <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
-        <img t-if="record[2].is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
-        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
+        <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
+        <span t-if="record.is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype oe_e oe_hidden" title="Edit subscription" t-att-data-id="record.id">&amp;</span>
+        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
     <!--
@@ -42,8 +42,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+mode+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+mode+record.id"><t t-raw="record.name"/></label></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
     </t>
-- 
cgit v1.2.3


From ea92a186f5272c252b3645d0fc52ff1e275188d1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Jul 2013 14:19:38 +0200
Subject: [FIX] mail: minor potential problem with JavaScript module loading

bzr revid: nicolas.vanhoren@openerp.com-20130726121938-b2uapok2dup56ol9
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src')

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5d54a6acc48..d0af3127404 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -2,7 +2,7 @@ openerp.mail = function (session) {
     var _t = session.web._t,
        _lt = session.web._lt;
 
-    var mail = session.mail = {};
+    var mail = session.mail;
 
     openerp_mail_followers(session, mail);          // import mail_followers.js
     openerp_FieldMany2ManyTagsEmail(session);       // import manyy2many_tags_email.js
-- 
cgit v1.2.3