[MERGE] Merged OpenChatter-3-5 followers refactoring. Followers is now a modified many2many field, using reference (res_model, res_id) to access one of the relationship. Added message_followers_ids and message_is_follower fields. Refactored subscribers management, because it is now managed through classic reads and writes in the field.

Web-side: the followers display is now a separated widget. It has been moved out of mail.js, into mail_followers.js. Modified views accordingly, because mail_followers is a widget on message_follower_ids field. This is more clean with other OpenERP aspects.
Misc: updated all views using Chatter in addons, to use mail_followers widget. Cleaned some issues. Also renamed mail.subscription into mail.followers, and propagated that change through the code.

bzr revid: tde@openerp.com-20120816003157-f2820hibc17f0j5q

2 files changed, 31 insertions, 20 deletions

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 6959a179194..7f49b7f3943 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -61,29 +61,9 @@
         <div class="oe_mail_recthread_main">
             <!-- contains the document thread -->
         </div>
-        <div class="oe_mail_recthread_aside">
-            <div class="oe_mail_recthread_actions">
-                <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
-                <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
-                <button type="button" class="oe_mail_button_followers">Show followers</button>
-            </div>
-            <div class="oe_mail_recthread_followers">
-                <h4>Followers</h4>
-                <ul class="oe_mail_followers_display"></ul>
-            </div>
-        </div>
     </div>
 
     <!--
-        record_thread.subscriber template
-        Template used to display a subscriber.
-        -->
-    <li t-name="mail.record_thread.subscriber">
-        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
-        <a t-attf-href="#model=res.users&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-    </li>
-
-    <!--
         mail.compose_message template
         This template holds the composition form to write a note or send
         an e-mail. It contains by default a textarea, that will be replaced
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
new file mode 100644
index 00000000000..53c899b9569
--- /dev/null
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+
+    <!--
+        followers main template
+        Template used to display the followers and the actions in a record.
+        -->
+    <div t-name="mail.followers" class="oe_mail_recthread_aside">
+        <div class="oe_mail_recthread_actions">
+            <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
+            <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
+            <button type="button" class="oe_mail_button_followers">Show followers</button>
+        </div>
+        <div class="oe_mail_recthread_followers">
+            <t t-if="widget.params.title">
+                <h4><t t-raw="widget.params.title"/></h4>
+            </t>
+            <ul class="oe_mail_followers_display"></ul>
+        </div>
+    </div>
+
+    <!--
+        followers.partner template
+        Template used to display a partner following the record
+        -->
+    <li t-name="mail.followers.partner">
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
+        <a t-attf-href="#model=res.users&amp;id=#{record.id}"><t t-raw="record.name"/></a>
+    </li>
+
+</template>