From 38a28e7ae555694901e3a17a9dc04fbf88da4b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 17 Oct 2012 11:43:22 +0200
Subject: [PATCH 001/106] [WIP] openchatter: css and dom refactor

bzr revid: fva@openerp.com-20121017094322-h0z9jjuod5q9up1y
---
 addons/mail/static/src/css/mail.css | 460 +++-------------------------
 addons/mail/static/src/js/mail.js   |  10 +-
 addons/mail/static/src/xml/mail.xml | 136 ++++----
 3 files changed, 111 insertions(+), 495 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 1592d79e18d..a8089bb9629 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,424 +1,64 @@
-/* ------------------------------------------------------------ */
-/* Reset because of ugly display of end of August
-/* ------------------------------------------------------------ */
-
-.openerp .oe_mail_wall ul, .openerp .oe_mail_wall li {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
+.openerp .oe_mail, .openerp .oe_mail *{
+    box-sizing: border-box;
 }
-
-.openerp .oe_chatter ul, .openerp .oe_chatter li {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
-}
-
-/* ------------------------------------------------------------ */
-/* Wall
-/* ------------------------------------------------------------ */
-
-.openerp div.oe_mail_wall {
-    overflow: auto;
-    padding: 0;
-    background: white;
-}
-
-.openerp div.oe_mail_wall div.oe_mail_wall_aside {
-    margin-left: 565px;
-    margin: 8px;
-}
-
-.openerp div.oe_mail_wall ul.oe_mail_wall_threads {
-    float: left;
+.openerp .oe_mail {
+    position: relative;
     width: 560px;
-    margin: 8px;
-    list-style-type: none;
-}
-
-/* ------------------------------------------------------------ */
-/* Followers
-/* ------------------------------------------------------------ */
-
-.openerp div.oe_mail_recthread_aside h4 {
-    display: inline-block;
-}
-.openerp div.oe_mail_recthread_aside button {
-    position: relative;
-}
-.openerp div.oe_mail_recthread_aside label,
-.openerp div.oe_mail_recthread_aside input {
-    cursor:pointer;
-}
-
-/* Specific display of threads in the wall */
-/* ------------------------------------------------------------ */
-
-.openerp ul.oe_mail_wall_threads .oe_mail_msg_content textarea.oe_mail_compose_textarea {
-    width: 434px;
-    height: 30px;
-    padding: 4px;
-}
-
-.openerp li.oe_mail_wall_thread:first .oe_mail_msg_notification {
-    border-top: 0;
-}
-
-.openerp div.oe_thread_placeholder img {
-    width: 28px;
-    height: 28px;
-}
-
-.openerp div.oe_thread_placeholder div.oe_mail_msg_content {
-    width: 440px;
-}
-
-
-/* ------------------------------------------------------------ */
-/* RecordThread
-/* ------------------------------------------------------------ */
-
-.openerp .oe_form div.oe_chatter {
-    overflow: auto;
-}
-
-.openerp .oe_mail_record_wall {
-    margin: auto;
-    width: 560px;
-}
-
-.openerp .oe_mail_record_wall > .oe_mail_wall_threads {
-    float: left;
-}
-
-.openerp div.oe_mail_recthread_aside {
-    float: right;
-    width: 250px;
-}
-
-.openerp div.oe_mail_recthread_actions {
-    margin-bottom: 8px;
-}
-
-.openerp div.oe_mail_recthread_actions button {
-    width: 120px;
-}
-
-.openerp .oe_mail_recthread_aside .oe_follower.oe_follow {
-  color: white;
-  background-color: #8a89ba;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
-  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
-}
-.openerp .oe_mail_recthread_aside .oe_follower.oe_following {
-  color: white;
-  background-color: #dc5f59;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
-  background-image: -webkit-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -moz-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -ms-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -o-linear-gradient(top, #dc5f59, #b33630);
-  background-image: linear-gradient(to bottom, #dc5f59, #b33630);
-}
-
-
-.openerp .oe_mail_recthread_aside .oe_follower span {
-    display:none;
-}
-.openerp .oe_mail_recthread_aside .oe_following span.oe_following,
-.openerp .oe_mail_recthread_aside .oe_notfollow span.oe_follow {
-    display:block;
-}
-
-.openerp div.oe_mail_recthread_followers {
-    margin-bottom: 8px;
-}
-
-
-/* ------------------------------------------------------------ */
-/* subtypes
-/* ------------------------------------------------------------ */
-
-.openerp .oe_mouse_subtypes {
-    display:inline-block;
-    position: relative;
-    z-index: 5;
-}
-.openerp .oe_mouse_subtypes .oe_recthread_subtypes {
-    background: #fff;
-    padding: 2px;
-    border: 1px solid #aaaaaa;
-    border-top: 0px;
-    position: absolute;
-    z-index: 2;
-}
-.openerp .oe_mouse_subtypes.oe_mouseout .oe_recthread_subtypes {
-    display: none;
-}
-.openerp .oe_mouse_subtypes.oe_mouseover .oe_recthread_subtypes {
-    display: block;
-}
-
-/* ------------------------------------------------------------ */
-/* Thread
-/* ------------------------------------------------------------ */
-
-.openerp div.oe_mail_thread_action {
-    white-space: normal;
-    padding: 8px;
-    z-index:5;
-    background: #fff;
-}
-
-.openerp div.oe_mail_thread_action:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
-.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body textarea:focus {
-    outline: 0;
-    border-color: rgba(82, 168, 236, 0.8);
-    -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-    -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-    -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-.openerp .oe_mail_vote_count,
-.openerp .oe_mail_msg_vote{
-    vertical-align: bottom;
-}
-
-.openerp div.oe_mail_thread_display {
-    white-space: normal;
-}
-
-.openerp div.oe_thread_placeholder {
-    margin-left: 66px;
-}
-
-.openerp li.oe_mail_thread_msg {
-    width: 560px;
-}
-
-.openerp div.oe_thread_placeholder li.oe_mail_thread_msg:last-child {
-    margin-bottom: 8px;
-}
-
-.openerp div.oe_mail_thread_more {
-    display: none;
-    border-bottom: 1px solid #D2D9E7;
-}
-
-.openerp li.oe_mail_thread_msg:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp li.oe_mail_thread_msg.oe_mail_read,
-.openerp li.oe_mail_thread_msg.oe_mail_read div {
-    border-left: #F0F0F0;
-}
-.openerp li.oe_mail_thread_msg.oe_mail_read li.oe_mail_thread_msg.oe_mail_unread,
-.openerp li.oe_mail_thread_msg.oe_mail_read li.oe_mail_thread_msg.oe_mail_unread div {
-    background-color: #F6F6F6;
-}
-
-.openerp li.oe_mail_thread_msg.oe_mail_unread>div>ul>li.oe_unread,
-.openerp li.oe_mail_thread_msg.oe_mail_read>div>ul>li.oe_read {
-    display: none;
-}
-
-.openerp li.oe_mail_thread_msg > div:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp div.oe_mail_msg {
-    padding: 0;
-    margin: 0 0 4px 0;
-}
-
-.openerp .oe_mail_msg_notification,
-.openerp .oe_mail_msg_expandable,
-.openerp .oe_mail_msg_comment,
-.openerp .oe_mail_msg_email {
-    padding: 8px;
-    background: white;
-    position: relative;
-}
-
-.openerp .oe_mail_msg_notification:after, 
-.openerp .oe_mail_msg_comment:after, 
-.openerp .oe_mail_msg_email:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp div.oe_mail_msg_content {
-    float: left;
-    position: relative;
-    width: 486px;
-}
-
-.openerp div.oe_mail_msg_content > li {
-    float: left;
-    margin-right: 3px;
-}
-
-.openerp .oe_mail_msg_content:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp .oe_chatter a {
-    cursor: pointer;
-}
-
-.openerp img.oe_mail_icon {
-    width: 50px;
-    height: 50px;
-}
-
-.openerp img.oe_mail_thumbnail {
-    width: 28px;
-    height: 28px;
-    margin: 4px;
-}
-
-.openerp img.oe_mail_frame {
-    text-align: center;
-    overflow: hidden;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
+    margin: 20px;
+    background: #EEE;
+    border: solid 1px #ccc;
     border-radius: 3px;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    clip: rect(5px, 40px, 45px, 0px);
+    padding: 8px;
 }
-
-.openerp .oe_mail_invisible {
-    display: none;
+.openerp .oe_mail .oe_thread{
+    margin-left: 8px;
 }
-
-/* ------------------------------------------------------------ */
-/* Messages layout
-/* ------------------------------------------------------------ */
-
-.openerp .oe_mail_msg .oe_mail_msg_title {
-    margin: 0;
-    font-size: 1.3em;
-    font-weight: bold;
+.openerp .oe_mail .oe_thread.oe_root_thread{
+    margin-left: 0px;
 }
-.openerp .oe_mail_msg .oe_mail_msg_title a:link,
-.openerp .oe_mail_msg .oe_mail_msg_title a:visited {
-    color: #4C4C4C;
-    text-decoration: none;
-}
-
-.openerp .oe_mail_msg .oe_mail_msg_body {
-    margin-bottom: .5em;
-    text-align: justify;
-}
-
-.openerp .oe_mail_msg .oe_mail_msg_body pre {
-    font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
-    margin: 0px;
-    white-space: pre-wrap;
-    display: inline;
-}
-
-/* Read more/less link */
-.openerp .oe_mail_msg span.oe_mail_reduce {
-    position: absolute;
-    right: 0;
-}
-
-/* Dropdown menu */
-
-.openerp .oe_mail ul.oe_mail_thread_display ul.oe_mail_thread_display {
+.openerp .oe_mail .oe_msg{
     position: relative;
-    border-left: 1px #DDD dashed;
+    background: blue;
+    margin-bottom: 4px;
+    min-height: 100px;
 }
-
-.openerp .oe_mail ul.oe_header {
+.openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
-    right: 3px;
-    top: -6px;
-    z-index: 10;
+    left:0; top: 0; bottom: 0; width: 75px;
+    background: red;
+    overflow: hidden;
 }
-
-.openerp .oe_mail ul.oe_header a {
+.openerp .oe_mail .oe_msg .oe_msg_center{
+    position: relative;
+    display: block;
+    margin-left: 75px;
+    margin-right: 32px;
+    background: gray;
+}
+.openerp .oe_mail .oe_msg .oe_msg_right{
+    position: absolute;
+    right:0; top:0; bottom: 0; width: 32px;
+    background: fuchsia;
+    overflow: hidden;
+}
+.openerp .oe_mail .oe_msg .oe_msg_footer{
+    height: 32px;
+    background: purple;
+    overflow: hidden;
+}
+.openerp .oe_mail .oe_msg .oe_msg_content{
+    display: block;
+    background: yellow;
+}
+.openerp .oe_mail .oe_msg .oe_msg_icons a{
     text-decoration: none;
+    display: block;
+    text-align: center;
 }
-
-.openerp .oe_mail ul.oe_header>li {
-    display: inline-block;
-    height: 20px;
-    text-align: right;
-}
-
-/* Message footer */
-.openerp .oe_mail_msg .oe_mail_msg_footer {
-    color: #888;
-}
-.openerp .oe_mail_msg .oe_mail_msg_footer li {
-    float: left;
-    margin-right: 3px;
-}
-.openerp .oe_mail_msg .oe_mail_msg_footer li:after {
-    content: " · ";
-}
-.openerp .oe_mail_msg .oe_mail_msg_footer li:last-child:after {
-    content: "";
-}
-
-/* Attachments list */
-.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments {
+.openerp .oe_mail .oe_msg .oe_msg_content textarea{
     width: 100%;
-    margin: .5em 0 0 0;
-    padding: .5em 0;
-    list-style-position: inside;
+    height: 100%;
+    margin: 0px;
+    padding: 0px;
+    resize: vertical;
 }
-.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments.oe_hidden {
-    display: none;
-}
-.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments li {
-    float: none;
-    height: 20px;
-    line-height: 20px;
-    margin: 0;
-    padding: 0;
-    list-style-type: square;
-}
-.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process {
-    float: right;
-    width: 200px;
-    height: 16px;
-}
-.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process div {
-    float: left;
-    width: 38px;
-    height: 16px;
-    margin-right: 2px;
-    background: #66FF66;
-}
-.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments .oe_upload_in_process span {
-    color: #aaaaaa;
-    position: absolute;
-}
-
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d2f2358af5f..f3bf7e9b9fa 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -503,7 +503,7 @@ openerp.mail = function(session) {
 
             // record parameters
             var param =         options.parameters;
-            for(var i in param){
+            for(var i in param){    //FIXME
                 this[i] = param[i];
             }
             this.id =           param.id || -1;
@@ -644,7 +644,7 @@ openerp.mail = function(session) {
                 }
             );
             /*insert thread in parent message*/
-            self.thread.appendTo(self.$el.find('div.oe_thread_placeholder'));
+            self.thread.replace(self.$('.oe_thread_placeholder'));
         },
         
         animated_destroy: function(options) {
@@ -1052,7 +1052,7 @@ openerp.mail = function(session) {
                     'parameters': message
                 });
             } else {
-                var message = new mail.ThreadMessage(self, {
+                var message = new mail.ThreadMessage(self, {    //FIXME
                     'domain': message.domain,
                     'context': {
                         'default_model':        message.model,
@@ -1227,7 +1227,7 @@ openerp.mail = function(session) {
             var thread_displayed = this.message_render();
             this.options.domain = this.options.domain.concat(this.search_results['domain']);
             this.bind_events();
-            return (searchview_ready && thread_displayed);
+            return (searchview_ready && thread_displayed); //FIXME
         },
 
         /**
@@ -1293,7 +1293,7 @@ openerp.mail = function(session) {
 
         bind_events: function(){
             var self=this;
-            this.$("button.oe_write_full:first").click(function(){ self.thread.ComposeMessage.on_compose_fullmail(); });
+            this.$("button.oe_write_full:first").click(function(){ self.thread.ComposeMessage.on_compose_fullmail(); }); //FIXME
             this.$("button.oe_write_onwall:first").click(function(){ self.thread.ComposeMessage.$el.toggle(); });
         }
     });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7ef47986542..14e656cc6fe 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
+    <!-- this template contains the mail widget and is used to namespace the css -->
+    <t t-name="mail">
+        <div class="oe_mail">
+        </div>
+    </t>
+
     <!--
         mail.compose_message template
         This template holds the composition form to write a note or send
@@ -9,24 +15,22 @@
         for main thread composition form in document form view.
         -->
     <t t-name="mail.compose_message">
-        <div class="oe_mail_compose_textarea">
-            <img class="oe_mail_icon oe_mail_frame oe_left" alt="User img"/>
-            <div class="oe_mail_msg_content">
-                <!-- contains the composition form -->
-                <!-- default content: old basic textarea -->
-                <div class="oe_mail_post_header">
-                    <t t-call="mail.thread.list_recipients"/>
-                    <a class="oe_cancel oe_e">X</a>
-                </div>
-                <textarea class="field_text" placeholder="Add your comment here..."/>
-                <div class="oe_mail_post_footer">
-                    <div class="oe_mail_compose_attachment_list"/>
-                    <button class="oe_full">Full mail message</button>
-                    <button class="oe_post">Post message</button>
+        <div class="oe_msg oe_msg_composer">
+            <div class="oe_msg_left">
+                <img class="oe_msg_icon" alt="User img"/>
+            </div>
+            <div class="oe_msg_center">
+                <div class="oe_msg_content">
+                    <textarea class="field_text" placeholder="Add your comment here..."/>
+                </div><div class="oe_msg_footer">
+                    <div class="oe_msg_attachment_list"/>
+                    <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
+                    <t t-call="mail.thread.list_recipients"/>
+                    <!--<a class="oe_cancel oe_e">X</a>-->
+                    <button class="oe_full oe_right">Full</button>
                 </div>
             </div>
-            <div class="oe_clear"/>
         </div>
     </t>
 
@@ -170,92 +174,64 @@
         </ul>
     </div>
 
-    <!--
-        thread template
-        This template holds a thread of comments. It begins with an actions
-        container, holding the composition form. Then come the various
-        messages. Then comes the 'more' button.
-        -->
-    <div t-name="mail.thread" class="oe_mail oe_mail_thread oe_semantic_html_override">
-        <div class="oe_mail_thread_action">
-            <!-- contains the composition box (form + image) -->
-        </div>
-        <ul class="oe_mail_thread_display">
-            <!-- contains the threads -->
-        </ul>
+    <div t-name="mail.thread" t-attf-class="oe_thread #{widget.root?'oe_root_thread':''} ">
     </div>
 
     <!-- default layout -->
-    <li t-name="mail.thread.message" t-attf-class="oe_mail oe_mail_thread_msg #{widget.unread?'oe_mail_unread':'oe_mail_read'}">
-        <div t-attf-class="oe_mail_msg_#{widget.type} oe_semantic_html_override">
+    <t t-name="mail.thread.message">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg#{widget.unread?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
-            <ul class="oe_header">
-                <li class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></li>
-                <li t-if="!widget.options.thread.display_on_flat" title="Read" class="oe_read"><a class="oe_read oe_e">W</a></li>
-                <li t-if="!widget.options.thread.display_on_flat" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>
-                <li title="Quick reply"><a class="oe_reply oe_e">)</a></li>
-                <t t-if="(widget.is_author and widget.options.message.show_dd_delete) or widget.type == 'email'">
-                    <li>
-                        <span class="oe_dropdown_toggle">
-                            <a class="oe_e" title="More options">í</a>
-                            <ul class="oe_dropdown_menu">
-                                <li t-if="widget.is_author and widget.options.message.show_dd_delete"><a class="oe_mail_msg_delete">Delete</a></li>
-                                <!--  Uncomment when adding subtype hiding
-                                <li t-if="display['show_hide']">
-                                    <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{widget.subtype}'>Hide '<t t-esc="widget.subtype"/>' for this document</a>
-                                </li> -->
-                                <li t-if="widget.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&amp;id=#{widget.id}" >Details</a></li>
-                            </ul>
-                        </span>
-                    </li>
-                </t>
-            </ul>
+            <div class='oe_msg_right'>
+                <div class="oe_msg_icons">
+                    <a t-if="!widget.options.thread.display_on_flat" title="Read" class="oe_read oe_e">W</a>
+                    <!--<li t-if="!widget.options.thread.display_on_flat" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>-->
+                    <a title="Reply" class="oe_reply oe_e">)</a>
+                </div>
+            </div>
 
-            <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
-                <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="widget.avatar"/>
-            </a>
+            <div class='oe_msg_left'>
+                <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                    <img class="oe_msg_icon" t-att-src="widget.avatar"/>
+                </a>
+            </div>
 
-            <div class="oe_mail_msg_content">
+            <div class="oe_msg_center">
                 <!-- message itself -->
-                <div class="oe_mail_msg">
-                    <h1 t-if="widget.subject" class="oe_mail_msg_title">
+                <div class="oe_msg_content">
+                    <h1 t-if="widget.subject" class="oe_msg_title">
                         <t t-raw="widget.subject"/>
                     </h1>
-                    <ul class="oe_mail_msg_footer">
-                        <li t-if="widget.author_id"><a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a></li>
-                        <li><span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span></li>
-                        <li t-if="widget.attachment_ids.length > 0">
-                            <a class="oe_mail_msg_view_attachments">
-                                <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
-                                <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
-                            </a>
-                        </li>
-                    </ul>
-                    <div class="oe_clear"/>
-                    <div class="oe_mail_msg_body">
+                    <div class="oe_msg_body">
                         <t t-if="widget.options.message.show_record_name and widget.record_name and (!widget.subject) and widget.options.thread._parents.length&lt;=widget.options.thread.thread_level and widget.model!='res.partner'">
                             <a class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a>
                         </t>
                         <t t-raw="widget.body"/>
                     </div>
                     <t t-if="widget.attachment_ids.length > 0">
-                        <div class="oe_clear"></div>
                         <t t-call="mail.thread.message.attachments"/>
                     </t>
                 </div>
+                <div class="oe_msg_footer">
+                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
+                        <a t-if="widget.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
+                            <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
+                            <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
+                        </a>
+                    <t t-call="mail.thread.message.vote"/>
+                </div>
             </div>
         </div>
-        <div class="oe_thread_placeholder"></div>
-    </li>
+    </t>
 
     <!-- expandable message layout -->
-    <li t-name="mail.thread.expandable" class="oe_mail oe_mail_thread_msg oe_mail_unread">
-        <div t-attf-class="oe_mail_msg_#{widget.type} oe_semantic_html_override">
-            <div class="oe_mail_msg_content oe_mail_msg_more_message">
-                <a class="oe_mail_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
+    <t t-name="mail.thread.expandable">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
+            <div class="oe_msg_content oe_msg_more_message">
+                <a class="oe_msg_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
             </div>
         </div>
-    </li>
+    </t>
 
     <!-- mail.thread.message.vote
         Template used to display Like/Unlike in a mail.message
@@ -270,13 +246,13 @@
                 <t t-esc="widget.vote_user_ids.length"/> people
             </t>
             <t t-if='widget.vote_user_ids.length > 0'>
-                agree
+                concur
             </t>
         </span>
         <button t-attf-class="oe_mail_msg_vote oe_tag">
             <span>
-                <t t-if="!widget.has_voted">Agree</t>
-                <t t-if="widget.has_voted">Unagree</t>
+                <t t-if="!widget.has_voted">Concur</t>
+                <t t-if="widget.has_voted">Respectfully disagree</t>
             </span>
         </button>
     </span>

From 09ee80ce68d5e9d48314bcbf1c1a1f18ae31515b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 12:40:26 +0200
Subject: [PATCH 002/106] [IMP] mail: deferred

bzr revid: chm@openerp.com-20121017104026-zamtldzb0k3s551s
---
 addons/mail/static/src/js/mail.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5e4e4d7d689..7025dcb2bd1 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1307,7 +1307,7 @@ openerp.mail = function(session) {
             var thread_displayed = this.message_render();
             this.options.domain = this.options.domain.concat(this.search_results['domain']);
             this.bind_events();
-            return (searchview_ready && thread_displayed);
+            return $.when(searchview_ready, thread_displayed);
         },
 
         /**
@@ -1377,6 +1377,7 @@ openerp.mail = function(session) {
         bind_events: function(){
             var self=this;
             this.$("button.oe_write_full:first").click(function(){ self.thread.ComposeMessage.on_compose_fullmail(); });
+
             this.$("button.oe_write_onwall:first").click(function(){ self.thread.ComposeMessage.$el.toggle(); });
         }
     });

From fc47385ded8680996ecdcaaf622ec27e63514d50 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 15:37:50 +0200
Subject: [PATCH 003/106] [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017133750-rqyyoprdkbg5fcom
---
 addons/mail/static/src/js/mail.js   | 201 +++++++++++++++++-----------
 addons/mail/static/src/xml/mail.xml |  15 ++-
 2 files changed, 133 insertions(+), 83 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ef687139887..ee59d868746 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -408,7 +408,7 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            this.$el.on('click', 'a.oe_mail_fetch_more', self.on_expandable);
+            this.$el.on('click', 'a.oe_msg_fetch_more', self.on_expandable);
         },
 
         animated_destroy: function(options) {
@@ -639,7 +639,7 @@ openerp.mail = function(session) {
                 }
             );
             /*insert thread in parent message*/
-            self.thread.replace(self.$('.oe_thread_placeholder'));
+            self.thread.insertAfter(self.$el);
         },
         
         animated_destroy: function(options) {
@@ -873,19 +873,11 @@ openerp.mail = function(session) {
         start: function() {
             this._super.apply(this, arguments);
 
-            this.list_ul = this.$('ul.oe_mail_thread_display:first');
             this.more_msg = this.$(">.oe_msg_more_message:first");
 
             this.display_user_avatar();
-            var display_done = compose_done = false;
             
             this.bind_events();
-
-            if(this.options.thread._parents[0]==this){
-                this.on_root_thread();
-            }
-
-            return display_done && compose_done;
         },
 
         instantiate_ComposeMessage: function(){
@@ -896,31 +888,12 @@ openerp.mail = function(session) {
                 'options': this.options,
                 'show_attachment_delete': true,
             });
-            this.ComposeMessage.appendTo(this.$(".oe_mail_thread_action:first"));
-        },
 
-        /* this method is runing for first parent thread
-        */
-        on_root_thread: function(){
-            var self=this;
-            // fetch and display message, using message_ids if set
-            this.message_fetch();
-
-            $(document).scroll( self.on_scroll );
-            $(window).resize( self.on_scroll );
-            window.setTimeout( self.on_scroll, 500 );
-
-            $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$('ul.oe_mail_thread_display'));
-
-            this.instantiate_ComposeMessage();
-            this.ComposeMessage.datasets.is_private=true;
-
-            if(this.options.thread.show_header_compose){
-                this.ComposeMessage.$el.show();
-                //this.ComposeMessage.set_free_attachments();
+            if(this.datasets.thread_level){
+                this.ComposeMessage.prependTo(this.$el);
+            } else {
+                this.ComposeMessage.appendTo(this.$el);
             }
-
-            this.$el.addClass("oe_mail_root_thread");
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -947,8 +920,16 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            self.$('.oe_mail_compose_textarea .oe_more').click(function () { var p=$(this).parent(); p.find('.oe_more_hidden, .oe_hidden').show(); p.find('.oe_more').hide(); });
-            self.$('.oe_mail_compose_textarea .oe_more_hidden').click(function () { var p=$(this).parent(); p.find('.oe_more_hidden, .oe_hidden').hide(); p.find('.oe_more').show(); });
+            self.$('.oe_mail_compose_textarea .oe_more').click(function () {
+                var p=$(this).parent(); 
+                p.find('.oe_more_hidden, .oe_hidden').show(); 
+                p.find('.oe_more').hide(); 
+            });
+            self.$('.oe_mail_compose_textarea .oe_more_hidden').click(function () {
+                var p=$(this).parent(); 
+                p.find('.oe_more_hidden, .oe_hidden').hide(); 
+                p.find('.oe_more').show(); 
+            });
         },
 
         /* get all child message/thread id linked
@@ -1027,11 +1008,20 @@ openerp.mail = function(session) {
         on_compose_message: function(){
             if(!this.ComposeMessage){
                 this.instantiate_ComposeMessage();
+            } else {
+                this.ComposeMessage.$el.toggle();
             }
-            this.ComposeMessage.$el.toggle();
             return false;
         },
 
+        /* display the no message on the thread
+        */
+        no_message: function(){
+
+            $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$el);
+
+        },
+
         /** Fetch messages
          * @param {Bool} initial_mode: initial mode: try to use message_data or
          *  message_ids, if nothing available perform a message_read; otherwise
@@ -1087,9 +1077,9 @@ openerp.mail = function(session) {
 
             // check if the message is already create
             for(var i in self.messages){
-                if(self.messages[i].datasets.id==message.datasets.id){
+                if(self.messages[i].datasets.id == message.datasets.id){
                     self.messages[i].destroy();
-                    self.messages[i]=self.insert_message(message);
+                    self.messages[i] = self.insert_message(message);
                     return true;
                 }
             }
@@ -1100,7 +1090,7 @@ openerp.mail = function(session) {
         insert_message: function (message) {
             var self=this;
 
-            this.$("li.oe_wall_no_message").remove();
+            this.$('.oe_wall_no_message').remove();
 
             // insert on hierarchy display => insert in self child
             var thread_messages = self.messages;
@@ -1161,19 +1151,19 @@ openerp.mail = function(session) {
                 if(sort){
                     message.insertBefore(parent_older.$el);
                 } else {
-                    message.insertAfter(parent_older.$el);
+                    message.insertAfter(parent_older.thread.$el);
                 }
             } else if(parent_newer){
                 if(sort){
-                    message.insertAfter(parent_newer.$el);
+                    message.insertAfter(parent_newer.thread.$el);
                 } else {
                     message.insertBefore(parent_newer.$el);
                 }
             } else {
                 if(sort && message.id > 0){
-                    message.prependTo(thread.list_ul);
+                    message.prependTo(thread.$el);
                 } else {
-                    message.appendTo(thread.list_ul);
+                    message.appendTo(thread.$el);
                 }
             }
 
@@ -1197,6 +1187,79 @@ openerp.mail = function(session) {
         },
     });
 
+    /** 
+     * ------------------------------------------------------------
+     * Wall Widget
+     * ------------------------------------------------------------
+     *
+     * This widget handles the display of messages on a Wall. Its main
+     * use is to receive a context and a domain, and to delegate the message
+     * fetching and displaying to the Thread widget.
+     */
+    session.web.client_actions.add('mail.Widget', 'session.mail.Widget');
+    mail.Widget = session.web.Widget.extend({
+        template: 'mail.Widget',
+
+        /**
+         * @param {Object} parent parent
+         * @param {Object} [options]
+         * @param {Array} [options.domain] domain on the Wall
+         * @param {Object} [options.context] context, is an object. It should
+         *      contain default_model, default_res_id, to give it to the threads.
+         * @param {Number} [options.thread_level] number of thread levels to display
+         *      0 being flat.
+         */
+        init: function (parent, options) {
+            this._super(parent);
+            this.options = options || {};
+            this.options.domain = options.domain || [];
+            this.options.context = options.context || {};
+            this.search_results = {'domain': [], 'context': {}, 'groupby': {}};
+        },
+
+        start: function (options) {
+            this._super.apply(this, arguments);
+            return this.message_render();
+        },
+
+        /**
+         * Display the threads
+          */
+        message_render: function (search) {
+            this.thread = new mail.Thread(this, {
+                    'domain' : this.options.domain,
+                    'context' : this.options.context,
+                    'options': {
+                        'thread' :{
+                            'use_composer': this.options.use_composer || false,
+                            'show_header_compose': this.options.show_header_compose || false,
+                            'typeof_thread': this.options.context.typeof_thread || 'inbox',
+                            'display_on_thread': this.options.display_on_thread || [0,1]
+                        },
+                        'message': {
+                            'show_reply': this.options.show_reply || [0,0],
+                            'show_read_unread': this.options.show_read_unread || [0,-1],
+                            'show_dd_delete': this.options.show_dd_delete || false,
+                        },
+                    },
+                    'datasets': {},
+                }
+            );
+
+            this.thread.appendTo( this.$el );
+            this.thread.no_message();
+            this.thread.message_fetch();
+
+            $(document).scroll( self.on_scroll );
+            $(window).resize( self.on_scroll );
+            window.setTimeout( self.on_scroll, 500 );
+        },
+
+        bind_events: function(){
+            var self=this;
+        }
+    });
+
 
     /** 
      * ------------------------------------------------------------
@@ -1249,19 +1312,12 @@ openerp.mail = function(session) {
             this.thread = new mail.Thread(self, {
                     'domain': domain,
                     'context': this.options.context,
-                    'options':{
-                        'thread':{
-                            'show_header_compose': show_header_compose,
-                            'use_composer': show_header_compose,
-                            'display_on_thread':[-1,-1]
-                        },
-                        'message':{
-                            'show_reply': [-1,-1],
-                            'show_read_unread': [-1,-1],
-                            'show_dd_delete': false
-                        }
-                    },
-                    'datasets': {},
+                    'show_header_compose': show_header_compose,
+                    'use_composer': show_header_compose,
+                    'display_on_thread':[-1,-1],
+                    'show_reply': [-1,-1],
+                    'show_read_unread': [-1,-1],
+                    'show_dd_delete': false
                 }
             );
             return this.thread.appendTo( this.$('.oe_mail_wall_threads:first') );
@@ -1350,33 +1406,26 @@ openerp.mail = function(session) {
         message_render: function (search) {
             var domain = this.options.domain.concat(this.search_results['domain']);
             var context = _.extend(this.options.context, search&&search.search_results['context'] ? search.search_results['context'] : {});
-            this.thread = new mail.Thread(this, {
-                    'domain' : domain,
-                    'context' : context,
-                    'options': {
-                        'thread' :{
-                            'use_composer': true,
-                            'show_header_compose': false,
-                            'typeof_thread': context.typeof_thread || 'inbox',
-                            'display_on_thread': [0,1]
-                        },
-                        'message': {
-                            'show_reply': [0,0],
-                            'show_read_unread': [0,-1],
-                            'show_dd_delete': false,
-                        },
-                    },
-                    'datasets': {},
+            this.root = new mail.Widget(this, {
+                'domain' : domain,
+                'context' : context,
+                'use_composer': true,
+                'show_header_compose': false,
+                'typeof_thread': context.typeof_thread || 'inbox',
+                'display_on_thread': [0,1],
+                'show_reply': [0,0],
+                'show_read_unread': [0,-1],
+                'show_dd_delete': false,
                 }
             );
-            return this.thread.appendTo( this.$('.oe_mail_wall_threads:first') );
+            return this.root.appendTo( this.$('.oe_mail_wall_threads:first') );
 
         },
 
         bind_events: function(){
             var self=this;
-            this.$("button.oe_write_full:first").click(function(){ self.thread.ComposeMessage.on_compose_fullmail(); });
-            this.$("button.oe_write_onwall:first").click(function(){ self.thread.ComposeMessage.$el.toggle(); });
+            this.$("button.oe_write_full:first").click(function(){ self.root.thread.ComposeMessage.on_compose_fullmail(); });
+            this.$("button.oe_write_onwall:first").click(function(){ self.root.thread.on_compose_message(); });
         }
     });
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 46e438cea51..6e292f147de 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,7 +2,7 @@
 <template>
 
     <!-- this template contains the mail widget and is used to namespace the css -->
-    <t t-name="mail">
+    <t t-name="mail.Widget">
         <div class="oe_mail">
         </div>
     </t>
@@ -152,9 +152,9 @@
     <!--
         display message on the wall when there are no message
         -->
-    <li t-name="mail.wall_no_message" class="oe_wall_no_message">
-        You have no messages
-    </li>
+    <t t-name="mail.wall_no_message">
+        <div class="oe_wall_no_message">You have no messages</div>
+    </t>
 
     <!--
         record_thread main template
@@ -168,12 +168,13 @@
         </ul>
     </div>
 
-    <div t-name="mail.thread" t-attf-class="oe_thread #{widget.root?'oe_root_thread':''} ">
-    </div>
+    <t t-name="mail.thread">
+        <div t-attf-class="oe_thread #{widget.root?'oe_root_thread':''}"/>
+    </t>
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg#{widget.unread?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">

From 241c53ce3621eb05fee55004ed4c3910c2546bf7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 16:20:05 +0200
Subject: [PATCH 004/106] [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017142005-yoxn406gva3flz3o
---
 addons/mail/static/src/js/mail.js   | 76 ++++++++++++++---------------
 addons/mail/static/src/xml/mail.xml |  1 -
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ee59d868746..6b39fae8dd8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -134,7 +134,6 @@ openerp.mail = function(session) {
             };
             this.options={};
             this.options.thread={};
-            this.options.thread.show_header_compose = options.options.thread.show_header_compose;
             this.options.thread.display_on_thread = options.options.thread.display_on_thread;
             this.options.thread.show_attachment_delete = true;
             this.options.thread.show_attachment_link = true;
@@ -315,9 +314,7 @@ openerp.mail = function(session) {
             this.$('input[data-id]').remove();
             //this.attachment_ids=[];
             this.display_attachments();
-            if(!this.options.thread.show_header_compose || !this.options.thread.display_on_thread[0]){
-                this.$el.hide();
-            }
+            this.$el.hide();
         },
 
         /*post a message and fetch the message*/
@@ -476,7 +473,6 @@ openerp.mail = function(session) {
          *              display before having a "show more" link; note that the text
          *              will not be truncated if it does not have 110% of the parameter
          *          @param {Boolean} [show_record_name]
-         *          @param {Boolean} [show_dd_delete]
          *          @param {Array [A,B]} [show_reply] display the reply button on the
          *              message for thread level between A and B. -1 for no begin or no end.
          *          @param {Array [A,B]} [show_read_unread] display the read/unread button on the
@@ -523,7 +519,6 @@ openerp.mail = function(session) {
                     'message_ids': options.options.message.message_ids || null,
                     'message_data': options.options.message.message_data || null,
                     'show_record_name': options.options.message.show_record_name != undefined ? options.options.message.show_record_name: true,
-                    'show_dd_delete': options.options.message.show_dd_delete || false,
                     'truncate_limit': options.options.message.truncate_limit || 250,
                     'show_reply': options.options.message.show_reply || [0,-1],
                     'show_read_unread': options.options.message.show_read_unread || [0,-1],
@@ -735,7 +730,7 @@ openerp.mail = function(session) {
                 if (!self.datasets.has_voted) {
                     var votes=[];
                     for(var i in self.datasets.vote_user_ids){
-                        if(self.datasets.vote_user_ids[i][0]!=self.datasets.session.uid)
+                        if(self.datasets.vote_user_ids[i][0]!=self.session.uid)
                             vote.push(self.datasets.vote_user_ids[i]);
                     }
                     self.datasets.vote_user_ids=votes;
@@ -803,8 +798,6 @@ openerp.mail = function(session) {
          * @param {Object} [options]
          *      @param {Object} [message] read about mail.ThreadMessage object
          *      @param {Object} [thread]
-         *          @param {Boolean} [use_composer] use the advanced composer, or
-         *              the default basic textarea if not set
          *          @param {Number} [expandable_number=5] number message show
          *              for each click on "show more message"
          *          @param {Number} [expandable_default_number=5] number message show
@@ -830,8 +823,6 @@ openerp.mail = function(session) {
             // options
             this.options={
                 'thread' : {
-                    'show_header_compose': (options.options.thread.show_header_compose != undefined ? options.options.thread.show_header_compose: false),
-                    'use_composer': options.options.thread.use_composer || false,
                     'expandable_number': options.options.thread.expandable_number || 5,
                     'expandable_default_number': options.options.thread.expandable_default_number || 5,
                     '_expandable_max': options.options.thread.expandable_default_number || 5,
@@ -1189,10 +1180,10 @@ openerp.mail = function(session) {
 
     /** 
      * ------------------------------------------------------------
-     * Wall Widget
+     * mail : root Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of messages on a Wall. Its main
+     * This widget handles the display of messages with thread options. Its main
      * use is to receive a context and a domain, and to delegate the message
      * fetching and displaying to the Thread widget.
      */
@@ -1202,12 +1193,25 @@ openerp.mail = function(session) {
 
         /**
          * @param {Object} parent parent
+         * @param {Array} [domain]
+         * @param {Object} [context] context of the thread. It should
+         *   contain at least default_model, default_res_id. Please refer to
+         *   the ComposeMessage widget for more information about it.
+         * ... @param {Select} [typeof_thread=(mail|stared|archives|send|other)]
+         *       options for destroy message when the user click on a button
          * @param {Object} [options]
-         * @param {Array} [options.domain] domain on the Wall
-         * @param {Object} [options.context] context, is an object. It should
-         *      contain default_model, default_res_id, to give it to the threads.
-         * @param {Number} [options.thread_level] number of thread levels to display
-         *      0 being flat.
+         *...  @param {Number} [truncate_limit=250] number of character to
+         *      display before having a "show more" link; note that the text
+         *      will not be truncated if it does not have 110% of the parameter
+         *...  @param {Boolean} [show_record_name] display the name and link for do action
+         *...  @param {Array [A,B]} [show_reply] display the reply button on the
+         *      message for thread level between A and B. -1 for no begin or no end.
+         *...  @param {Array [A,B]} [show_read_unread] display the read/unread button on the
+         *      message for thread level between A and B. -1 for no begin or no end.
+         *...  @param {Array [A,B]} [display_on_thread] display the threads (hierarchy)
+         *      for the thread level between A and B. -1 for no begin or no end.
+         *      All thread before A are insert in the root thread.
+         *      All thread after B are insert in parent thread on B level.
          */
         init: function (parent, options) {
             this._super(parent);
@@ -1219,7 +1223,8 @@ openerp.mail = function(session) {
 
         start: function (options) {
             this._super.apply(this, arguments);
-            return this.message_render();
+            this.message_render();
+            this.bind_events();
         },
 
         /**
@@ -1231,15 +1236,14 @@ openerp.mail = function(session) {
                     'context' : this.options.context,
                     'options': {
                         'thread' :{
-                            'use_composer': this.options.use_composer || false,
-                            'show_header_compose': this.options.show_header_compose || false,
-                            'typeof_thread': this.options.context.typeof_thread || 'inbox',
+                            'typeof_thread': this.options.typeof_thread || 'inbox',
                             'display_on_thread': this.options.display_on_thread || [0,1]
                         },
                         'message': {
                             'show_reply': this.options.show_reply || [0,0],
                             'show_read_unread': this.options.show_read_unread || [0,-1],
-                            'show_dd_delete': this.options.show_dd_delete || false,
+                            'truncate_limit': this.options.truncate_limit || 250,
+                            'show_record_name': this.options.show_record_name || false,
                         },
                     },
                     'datasets': {},
@@ -1249,14 +1253,14 @@ openerp.mail = function(session) {
             this.thread.appendTo( this.$el );
             this.thread.no_message();
             this.thread.message_fetch();
-
-            $(document).scroll( self.on_scroll );
-            $(window).resize( self.on_scroll );
-            window.setTimeout( self.on_scroll, 500 );
         },
 
         bind_events: function(){
-            var self=this;
+            if(this.options.context.typeof_thread!='other'){
+                $(document).scroll( this.thread.on_scroll );
+                $(window).resize( this.thread.on_scroll );
+                window.setTimeout( this.thread.on_scroll, 500 );
+            }
         }
     });
 
@@ -1302,24 +1306,20 @@ openerp.mail = function(session) {
                 default_is_private: false });
             // update domain
             var domain = this.options.domain.concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]);
-            // create and render Thread widget
-            var show_header_compose = this.view.is_action_enabled('edit') ||
-                (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
-
+            
             if(this.thread){
                 this.thread.destroy();
             }
             this.thread = new mail.Thread(self, {
                     'domain': domain,
                     'context': this.options.context,
-                    'show_header_compose': show_header_compose,
-                    'use_composer': show_header_compose,
+                    'typeof_thread': this.options.context.typeof_thread || 'other',
                     'display_on_thread':[-1,-1],
                     'show_reply': [-1,-1],
                     'show_read_unread': [-1,-1],
-                    'show_dd_delete': false
                 }
             );
+
             return this.thread.appendTo( this.$('.oe_mail_wall_threads:first') );
         },
     });
@@ -1409,17 +1409,13 @@ openerp.mail = function(session) {
             this.root = new mail.Widget(this, {
                 'domain' : domain,
                 'context' : context,
-                'use_composer': true,
-                'show_header_compose': false,
-                'typeof_thread': context.typeof_thread || 'inbox',
+                'typeof_thread': context.typeof_thread || 'other',
                 'display_on_thread': [0,1],
                 'show_reply': [0,0],
                 'show_read_unread': [0,-1],
-                'show_dd_delete': false,
                 }
             );
             return this.root.appendTo( this.$('.oe_mail_wall_threads:first') );
-
         },
 
         bind_events: function(){
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 6e292f147de..470478c0c21 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -178,7 +178,6 @@
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-                    <span class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></span>
                     <span class="placeholder-mail-star"><t t-call="mail.thread.message.star"/></span>
                     <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
                     <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>

From de47c4cb526af08382eda3ccb945256682b54337 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 17:03:27 +0200
Subject: [PATCH 005/106] [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017150327-eo8z8kqaa2dnoc10
---
 addons/mail/static/src/js/mail.js   | 8 ++++----
 addons/mail/static/src/xml/mail.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6b39fae8dd8..02b8479b0fc 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -881,9 +881,9 @@ openerp.mail = function(session) {
             });
 
             if(this.datasets.thread_level){
-                this.ComposeMessage.prependTo(this.$el);
-            } else {
                 this.ComposeMessage.appendTo(this.$el);
+            } else {
+                this.ComposeMessage.prependTo(this.$el);
             }
         },
 
@@ -1142,11 +1142,11 @@ openerp.mail = function(session) {
                 if(sort){
                     message.insertBefore(parent_older.$el);
                 } else {
-                    message.insertAfter(parent_older.thread.$el);
+                    message.insertAfter(parent_older.thread ? parent_older.thread.$el : parent_older.$el);
                 }
             } else if(parent_newer){
                 if(sort){
-                    message.insertAfter(parent_newer.thread.$el);
+                    message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
                 } else {
                     message.insertBefore(parent_newer.$el);
                 }
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 470478c0c21..03603b65a49 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -178,7 +178,7 @@
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-                    <span class="placeholder-mail-star"><t t-call="mail.thread.message.star"/></span>
+                    <t t-call="mail.thread.message.star"/>
                     <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
                     <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>
                     <a t-if="widget.datasets.show_reply" title="Reply" class="oe_reply oe_e">)</a>

From 81bc720be8c1915f8b8a9d172f06e5309adf0d47 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 17:09:41 +0200
Subject: [PATCH 006/106] [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017150941-bqwwxndhiytcu3pu
---
 addons/mail/static/src/js/mail.js   | 7 +++----
 addons/mail/static/src/xml/mail.xml | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 02b8479b0fc..62de7bf3842 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -136,7 +136,6 @@ openerp.mail = function(session) {
             this.options.thread={};
             this.options.thread.display_on_thread = options.options.thread.display_on_thread;
             this.options.thread.show_attachment_delete = true;
-            this.options.thread.show_attachment_link = true;
 
             this.parent_thread= parent.messages!= undefined ? parent : false;
 
@@ -161,11 +160,11 @@ openerp.mail = function(session) {
             var self = this;
             var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self}));
             if(!this.list_attachment){
-                this.$('.oe_mail_compose_attachment_list').replaceWith( render );
+                this.$('.oe_msg_attachment_list').replaceWith( render );
             } else {
                 this.list_attachment.replaceWith( render );
             }
-            this.list_attachment = this.$("ul.oe_msg_attachments");
+            this.list_attachment = this.$(".oe_msg_attachments");
 
             // event: delete an attachment
             this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
@@ -602,7 +601,7 @@ openerp.mail = function(session) {
         },
 
         expender: function(){
-            this.$('div.oe_msg_body:first').expander({
+            this.$('.oe_msg_body:first').expander({
                 slicePoint: this.options.truncate_limit,
                 expandText: 'read more',
                 userCollapseText: '[^]',
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 03603b65a49..4952c72546b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -59,7 +59,7 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <ul t-attf-class="oe_msg_attachments #{widget.datasets.attachment_ids[0] and widget.options.thread.show_attachment_link?'':'oe_hidden'}">
+        <ul t-attf-class="oe_msg_attachments #{widget.datasets.attachment_ids[0]?'':'oe_hidden'}">
             <t t-foreach="widget.datasets.attachment_ids" t-as="attachment">
                 <li>
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">

From e33bcf5e0256198dd77aa385f8d8e98d8b7b7be9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 17:17:15 +0200
Subject: [PATCH 007/106] [IMP]mail: js/dom ok

bzr revid: chm@openerp.com-20121017151715-hh08mpd57dcj6o2d
---
 addons/mail/static/src/js/mail.js | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 62de7bf3842..d58ac1cd8af 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -148,10 +148,7 @@ openerp.mail = function(session) {
         start: function(){
             this.display_attachments();
             this.bind_events();
-
-            //load avatar img
-            var user_avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
-            this.$('img.oe_mail_icon').attr('src', user_avatar);
+            this.display_user_avatar();
         },
 
         /* upload the file on the server, add in the attachments list and reload display
@@ -353,6 +350,11 @@ openerp.mail = function(session) {
                 return true;
             }
         },
+
+        display_user_avatar: function () {
+            var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
+            return this.$('img.oe_msg_icon').attr('src', avatar);
+        },
     });
 
     /** 
@@ -862,11 +864,6 @@ openerp.mail = function(session) {
         
         start: function() {
             this._super.apply(this, arguments);
-
-            this.more_msg = this.$(">.oe_msg_more_message:first");
-
-            this.display_user_avatar();
-            
             this.bind_events();
         },
 
@@ -1159,11 +1156,6 @@ openerp.mail = function(session) {
 
             return message
         },
-
-        display_user_avatar: function () {
-            var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
-            return this.$('img.oe_mail_icon').attr('src', avatar);
-        },
         
         /*  Send the records to his parent thread */
         switch_new_message: function(records) {

From b1f8696c15f7c5c9172f3b70d815a7c8b9a67ed0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 18 Oct 2012 10:04:11 +0200
Subject: [PATCH 008/106] [IMP] mail, openchatter: textarea compact/expandable

bzr revid: chm@openerp.com-20121018080411-xggdwzkvrs7zeojn
---
 addons/mail/static/src/js/mail.js   | 73 +++++++++++++++++++----------
 addons/mail/static/src/xml/mail.xml | 13 ++++-
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d58ac1cd8af..7f18f650dae 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -106,10 +106,14 @@ openerp.mail = function(session) {
      * 
      * This widget handles the display of a form to compose a new message.
      * This form is a mail.compose.message form_view.
-     */
+     * On first time : display a compact textarea but is not the compose form.
+     * When the user focus this box, the compose message is intantiate and 
+     * with focus on the textarea.
+    */
     
     mail.ThreadComposeMessage = session.web.Widget.extend({
-        template: 'mail.compose_message',
+        template: 'mail.compose_message.compact',
+                    // expandable view : 'mail.compose_message'
 
         /**
          * @param {Object} parent parent
@@ -130,7 +134,8 @@ openerp.mail = function(session) {
                 'model': options.datasets.model,
                 'res_model': options.datasets.res_model,
                 'is_private': options.datasets.is_private || false,
-                'partner_ids': options.datasets.partner_ids || []
+                'partner_ids': options.datasets.partner_ids || [],
+                'avatar': mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid),
             };
             this.options={};
             this.options.thread={};
@@ -148,7 +153,6 @@ openerp.mail = function(session) {
         start: function(){
             this.display_attachments();
             this.bind_events();
-            this.display_user_avatar();
         },
 
         /* upload the file on the server, add in the attachments list and reload display
@@ -166,6 +170,9 @@ openerp.mail = function(session) {
             // event: delete an attachment
             this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
         },
+
+        /* when a user click on the upload button, send file read on_attachment_loaded
+        */
         on_attachment_change: function (event) {
             event.stopPropagation();
             var self = this;
@@ -205,6 +212,8 @@ openerp.mail = function(session) {
             }
         },
         
+        /* when the file is uploaded 
+        */
         on_attachment_loaded: function (event, result) {
             //session.web.unblockUI();
             for(var i in this.datasets.attachment_ids){
@@ -223,6 +232,7 @@ openerp.mail = function(session) {
             $input.after($input.clone(true)).remove();
             this.$(".oe_attachment_file").show();
         },
+
         /* unlink the file on the server and reload display
          */
         on_attachment_delete: function (event) {
@@ -270,6 +280,7 @@ openerp.mail = function(session) {
             this.$el.on('click', 'a.oe_cancel', self.on_cancel );
             this.$el.on('click', 'button.oe_post', function(){self.on_message_post()} );
             this.$el.on('click', 'button.oe_full', function(){self.on_compose_fullmail()} );
+            self.$el.on('focus', 'textarea.oe_compact', self.on_compose_expandable);
         },
 
         on_compose_fullmail: function(){
@@ -351,9 +362,21 @@ openerp.mail = function(session) {
             }
         },
 
-        display_user_avatar: function () {
-            var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
-            return this.$('img.oe_msg_icon').attr('src', avatar);
+        /* convert the compact mode into the compose message
+        */
+        on_compose_expandable: function(){
+            var $render = $(session.web.qweb.render('mail.compose_message', {'widget': this}));
+            this.$el.replaceWith( $render );
+            this.$el = $render;
+            this.$('textarea').focus();
+        },
+
+        /* convert the compact mode into the compose message
+        */
+        on_compose_compact: function(){
+            var $render = $(session.web.qweb.render('mail.compose_message.compact', {'widget': this}));
+            this.$el.replaceWith( $render );
+            this.$el = $render;
         },
     });
 
@@ -864,11 +887,11 @@ openerp.mail = function(session) {
         
         start: function() {
             this._super.apply(this, arguments);
+            this.instantiate_ComposeMessage();
             this.bind_events();
         },
 
         instantiate_ComposeMessage: function(){
-            // add message composition form view
             this.ComposeMessage = new mail.ThreadComposeMessage(this,{
                 'context': this.context,
                 'datasets': this.datasets,
@@ -879,6 +902,7 @@ openerp.mail = function(session) {
             if(this.datasets.thread_level){
                 this.ComposeMessage.appendTo(this.$el);
             } else {
+                // root view
                 this.ComposeMessage.prependTo(this.$el);
             }
         },
@@ -907,16 +931,20 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            self.$('.oe_mail_compose_textarea .oe_more').click(function () {
-                var p=$(this).parent(); 
-                p.find('.oe_more_hidden, .oe_hidden').show(); 
-                p.find('.oe_more').hide(); 
-            });
-            self.$('.oe_mail_compose_textarea .oe_more_hidden').click(function () {
-                var p=$(this).parent(); 
-                p.find('.oe_more_hidden, .oe_hidden').hide(); 
-                p.find('.oe_more').show(); 
-            });
+            self.$el.on('click', '.oe_mail_list_recipients .oe_more', self.on_show_recipients);
+            self.$el.on('click', '.oe_mail_compose_textarea .oe_more_hidden', self.on_hide_recipients);
+        },
+
+        on_show_recipients: function(){
+            var p=$(this).parent(); 
+            p.find('.oe_more_hidden, .oe_hidden').show(); 
+            p.find('.oe_more').hide(); 
+        },
+
+        on_hide_recipients: function(){
+            var p=$(this).parent(); 
+            p.find('.oe_more_hidden, .oe_hidden').hide(); 
+            p.find('.oe_more').show(); 
         },
 
         /* get all child message/thread id linked
@@ -993,20 +1021,13 @@ openerp.mail = function(session) {
         /* this function is launch when a user click on "Reply" button
         */
         on_compose_message: function(){
-            if(!this.ComposeMessage){
-                this.instantiate_ComposeMessage();
-            } else {
-                this.ComposeMessage.$el.toggle();
-            }
-            return false;
+            this.ComposeMessage.on_compose_expandable();
         },
 
         /* display the no message on the thread
         */
         no_message: function(){
-
             $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$el);
-
         },
 
         /** Fetch messages
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 4952c72546b..6a76c7aa323 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,7 +17,7 @@
     <t t-name="mail.compose_message">
         <div class="oe_msg oe_msg_composer">
             <div class="oe_msg_left">
-                <img class="oe_msg_icon" alt="User img"/>
+                <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.datasets.avatar}"/>
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
@@ -34,6 +34,17 @@
         </div>
     </t>
 
+    <!--
+        mail.compose_message.compact template
+        This template holds the composition form to write a message, this box is converted into
+        mail.compose_message when focus on textarea
+        -->
+    <t t-name="mail.compose_message.compact">
+        <div class="oe_msg oe_msg_composer_compact">
+            <textarea class="field_text oe_compact" placeholder="Add your comment here..."/>
+        </div>
+    </t>
+
     <!--
         mail.compose_message.add_attachment template
         Small template to be inserted in the composition for add attachments

From aa472b8f9528874e6e6744060fa46680be54a5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 18 Oct 2012 14:02:53 +0200
Subject: [PATCH 009/106] [FIX] mail: composition button bindings + annoying
 button commented out

bzr revid: fva@openerp.com-20121018120253-mc260x4ljfzrhrsh
---
 addons/mail/static/src/js/mail.js   | 2 ++
 addons/mail/static/src/xml/mail.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7f18f650dae..8e1be70e459 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -369,6 +369,7 @@ openerp.mail = function(session) {
             this.$el.replaceWith( $render );
             this.$el = $render;
             this.$('textarea').focus();
+            this.bind_events();
         },
 
         /* convert the compact mode into the compose message
@@ -377,6 +378,7 @@ openerp.mail = function(session) {
             var $render = $(session.web.qweb.render('mail.compose_message.compact', {'widget': this}));
             this.$el.replaceWith( $render );
             this.$el = $render;
+            this.bind_events();
         },
     });
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 6a76c7aa323..450e9a834e2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -246,7 +246,7 @@
         -->
     <t t-name="mail.compose_message.button_top_bar">
         <div class="oe_topbar_compose_full_email">
-            <button class="oe_button oe_highlight">Write an email</button>
+            <!-- <button class="oe_button oe_highlight">Write an email</button> -->
         </div>
     </t>
 

From c040aa5a843adce17e498222b33d1227bf24324d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 18 Oct 2012 14:53:28 +0200
Subject: [PATCH 010/106] [IMP] mail: further work on the css

bzr revid: fva@openerp.com-20121018125328-7oxxd28kbzmm9k03
---
 addons/mail/static/src/css/mail.css | 28 ++++++++++++++++++++++++----
 addons/mail/static/src/xml/mail.xml | 12 +++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index a8089bb9629..3d73bbfa33a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -11,16 +11,19 @@
     padding: 8px;
 }
 .openerp .oe_mail .oe_thread{
-    margin-left: 8px;
+    margin-left: 32px;
 }
-.openerp .oe_mail .oe_thread.oe_root_thread{
+.openerp .oe_mail > .oe_thread{
     margin-left: 0px;
 }
+
+/* ---------------- MESSAGES ------------------ */
+
 .openerp .oe_mail .oe_msg{
     position: relative;
     background: blue;
     margin-bottom: 4px;
-    min-height: 100px;
+    min-height: 75px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
@@ -32,9 +35,11 @@
     position: relative;
     display: block;
     margin-left: 75px;
-    margin-right: 32px;
     background: gray;
 }
+.openerp .oe_mail .oe_msg.oe_with_buttons .oe_msg_center{
+    margin-right: 32px;
+}
 .openerp .oe_mail .oe_msg .oe_msg_right{
     position: absolute;
     right:0; top:0; bottom: 0; width: 32px;
@@ -62,3 +67,18 @@
     padding: 0px;
     resize: vertical;
 }
+.openerp .oe_mail .oe_msg.oe_msg_composer_compact{
+    padding:4px;
+    min-height:0px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_composer_compact textarea{
+    height: 24px;
+    width: 100%;
+}
+
+.openerp .oe_mail .oe_msg.oe_msg_unread .oe_unread{
+    display:none;
+}
+.openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
+    display:none;
+}
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 450e9a834e2..1980c9661f7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -185,7 +185,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
@@ -204,7 +204,7 @@
 
             <div class="oe_msg_center">
                 <!-- message itself -->
-                <div class="oe_mail_msg">
+                <div class="oe_msg_content">
                     <h1 t-if="widget.datasets.subject" class="oe_msg_title">
                         <t t-raw="widget.datasets.subject"/>
                     </h1>
@@ -277,10 +277,8 @@
     <!-- mail.thread.message.star
         Template used to display stared/unstared message in a mail.message
     -->
-    <span t-name="mail.thread.message.star">
-        <span class="oe_left">
-            <button t-attf-class="oe_mail_starbox oe_tag #{widget.datasets.has_stared?'oe_stared':''}">*</button>
-        </span>
-    </span>
+    <t t-name="mail.thread.message.star">
+         <a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a>
+    </t>
 
 </template>

From 8bee0d228191f2985f9f240b6090c93271050776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 18 Oct 2012 15:50:50 +0200
Subject: [PATCH 011/106] [IMP] mail: the css doesn't makes your eyes bleed
 anymore

bzr revid: fva@openerp.com-20121018135050-ihwzxb5f26d927oq
---
 addons/mail/static/src/css/mail.css | 29 +++++++++++++++--------------
 addons/mail/static/src/js/mail.js   |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 3d73bbfa33a..9d317f714d7 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -4,11 +4,7 @@
 .openerp .oe_mail {
     position: relative;
     width: 560px;
-    margin: 20px;
-    background: #EEE;
-    border: solid 1px #ccc;
-    border-radius: 3px;
-    padding: 8px;
+    margin: 16px;
 }
 .openerp .oe_mail .oe_thread{
     margin-left: 32px;
@@ -21,21 +17,26 @@
 
 .openerp .oe_mail .oe_msg{
     position: relative;
-    background: blue;
+    background: #f7f7f7;
+    border-radius: 2px;
+    border: solid 1px #ececec;
     margin-bottom: 4px;
     min-height: 75px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
-    left:0; top: 0; bottom: 0; width: 75px;
-    background: red;
+    left:0; top: 0; bottom: 0; width: 40px;
     overflow: hidden;
 }
+.openerp .oe_mail .oe_msg .oe_msg_icon{
+    width: 32px;
+    margin: 4px;
+    border-radius: 2px;
+}
 .openerp .oe_mail .oe_msg .oe_msg_center{
     position: relative;
     display: block;
-    margin-left: 75px;
-    background: gray;
+    margin-left: 40px;
 }
 .openerp .oe_mail .oe_msg.oe_with_buttons .oe_msg_center{
     margin-right: 32px;
@@ -43,17 +44,17 @@
 .openerp .oe_mail .oe_msg .oe_msg_right{
     position: absolute;
     right:0; top:0; bottom: 0; width: 32px;
-    background: fuchsia;
     overflow: hidden;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
     height: 32px;
-    background: purple;
+    padding-left: 4px;
     overflow: hidden;
 }
 .openerp .oe_mail .oe_msg .oe_msg_content{
     display: block;
-    background: yellow;
+    overflow: hidden;
+    padding: 4px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_icons a{
     text-decoration: none;
@@ -67,7 +68,7 @@
     padding: 0px;
     resize: vertical;
 }
-.openerp .oe_mail .oe_msg.oe_msg_composer_compact{
+.openerp .oe_mail .oe_msg.oe_msg_composer_compact, .openerp .oe_mail .oe_msg.oe_msg_expandable{
     padding:4px;
     min-height:0px;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8e1be70e459..d2a4509ffc3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -695,7 +695,7 @@ openerp.mail = function(session) {
             // if this message is read, all childs message display is read
             var ids = [this.datasets.id].concat( this.get_child_ids() );
             var read = $(event.srcElement).hasClass("oe_read");
-            this.$el.removeClass("oe_mail_" + (read?"un":"") + "read").addClass("oe_mail_" + (read?"":"un") + "read");
+            this.$el.removeClass(read ? 'oe_msg_unread':'oe_msg_read').addClass(read ? 'oe_msg_read':'oe_msg_unread');
 
             if( (read && this.options.thread.typeof_thread == 'inbox') ||
                 (!read && this.options.thread.typeof_thread == 'archives')) {

From 0a210d1a353ec565badb81632110aa7507f5c170 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 18 Oct 2012 18:39:23 +0200
Subject: [PATCH 012/106] [IMP] mail: improve js for dom css

bzr revid: chm@openerp.com-20121018163923-yk2splqzvnr02q9g
---
 addons/mail/static/src/js/mail.js   | 306 ++++++++++++----------------
 addons/mail/static/src/xml/mail.xml |   4 +-
 2 files changed, 129 insertions(+), 181 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8e1be70e459..f57f77ce34e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -121,26 +121,24 @@ openerp.mail = function(session) {
          *      @param {Object} [context] context passed to the
          *          mail.compose.message DataSetSearch. Please refer to this model
          *          for more details about fields and default values.
-         *      @param {Boolean} [show_attachment_delete] 
          */
-        init: function (parent, options) {
+        init: function (parent, datasets, options) {
             var self = this;
             this._super(parent);
             this.context = options.context || {};
 
             this.datasets = {
                 'attachment_ids' : [],
-                'id': options.datasets.id,
-                'model': options.datasets.model,
-                'res_model': options.datasets.res_model,
-                'is_private': options.datasets.is_private || false,
-                'partner_ids': options.datasets.partner_ids || [],
+                'id': datasets.id,
+                'model': datasets.model,
+                'res_model': datasets.res_model,
+                'is_private': datasets.is_private || false,
+                'partner_ids': datasets.partner_ids || [],
                 'avatar': mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid),
             };
             this.options={};
-            this.options.thread={};
-            this.options.thread.display_on_thread = options.options.thread.display_on_thread;
-            this.options.thread.show_attachment_delete = true;
+            this.options.display_indented_thread = options.options.display_indented_thread || -1;
+            this.options.show_attachment_delete = true;
 
             this.parent_thread= parent.messages!= undefined ? parent : false;
 
@@ -352,7 +350,7 @@ openerp.mail = function(session) {
                         false, 
                         this.context.default_parent_id, 
                         attachments,
-                        _.extend(this.parent_thread.context, {'message_loaded':[this.datasets.id||0].concat( self.parent_thread.options.thread._parents[0].get_child_ids() )})]
+                        _.extend(this.parent_thread.context, {'message_loaded':[this.datasets.id||0].concat( self.parent_thread.options._parents[0].get_child_ids() )})]
                     ).then(function(records){
                         self.parent_thread.switch_new_message(records);
                         self.datasets.attachment_ids=[];
@@ -398,7 +396,7 @@ openerp.mail = function(session) {
     mail.ThreadExpandable = session.web.Widget.extend({
         template: 'mail.thread.expandable',
 
-        init: function(parent, options) {
+        init: function(parent, datasets, options) {
             this._super(parent);
             this.domain = options.domain || [];
             this.context = _.extend({
@@ -407,17 +405,17 @@ openerp.mail = function(session) {
                 default_parent_id: false }, options.context || {});
 
             this.datasets = {
-                'id' : options.datasets.id || -1,
-                'model' : options.datasets.model || false,
-                'parent_id' : options.datasets.parent_id || false,
-                'nb_messages' : options.datasets.nb_messages || 0,
+                'id' : datasets.id || -1,
+                'model' : datasets.model || false,
+                'parent_id' : datasets.parent_id || false,
+                'nb_messages' : datasets.nb_messages || 0,
                 'type' : 'expandable',
-                'max_limit' : options.datasets.max_limit || false,
+                'max_limit' : datasets.max_limit || false,
                 'flag_used' : false,
             };
 
             // record options and data
-            this.parent_thread= parent.messages!= undefined ? parent : options.options.thread._parents[0] ;
+            this.parent_thread= parent.messages!= undefined ? parent : options.options._parents[0] ;
         },
 
         
@@ -499,16 +497,13 @@ openerp.mail = function(session) {
          *              display before having a "show more" link; note that the text
          *              will not be truncated if it does not have 110% of the parameter
          *          @param {Boolean} [show_record_name]
-         *          @param {Array [A,B]} [show_reply] display the reply button on the
-         *              message for thread level between A and B. -1 for no begin or no end.
-         *          @param {Array [A,B]} [show_read_unread] display the read/unread button on the
-         *              message for thread level between A and B. -1 for no begin or no end.
+         *...  @param {int} [show_reply_button] number thread level to display the reply button
+         *...  @param {int} [show_read_unread_button] number thread level to display the read/unread button
          */
-        init: function(parent, options) {
+        init: function(parent, datasets, options) {
             this._super(parent);
 
             // record datasets
-            var param = options.datasets;
             this.datasets = _.extend({
                 'id' : -1,
                 'model' : false,
@@ -528,8 +523,8 @@ openerp.mail = function(session) {
                 'to_read' : true,
                 'author_id' : [],
                 'attachment_ids' : [],
-            }, param || {});
-            this.datasets._date = param.date;
+            }, datasets || {});
+            this.datasets._date = datasets.date;
 
             // record domain and context
             this.domain = options.domain || [];
@@ -539,28 +534,20 @@ openerp.mail = function(session) {
                 default_parent_id: false }, options.context || {});
 
             // record options
-            this.options={
-                'thread' : options.options.thread,
-                'message' : {
-                    'message_ids': options.options.message.message_ids || null,
-                    'message_data': options.options.message.message_data || null,
-                    'show_record_name': options.options.message.show_record_name != undefined ? options.options.message.show_record_name: true,
-                    'truncate_limit': options.options.message.truncate_limit || 250,
-                    'show_reply': options.options.message.show_reply || [0,-1],
-                    'show_read_unread': options.options.message.show_read_unread || [0,-1],
-                }
-            };
+            this.options = _.extend(options.options, {
+                'message_ids': options.options.message_ids || null,
+                'message_data': options.options.message_data || null,
+                'show_record_name': options.options.show_record_name != undefined ? options.options.show_record_name: true,
+                'truncate_limit': options.options.truncate_limit || 250,
+                'show_reply_button': options.options.show_reply_button || -1,
+                'show_read_unread_button': options.options.show_read_unread_button || -1
+            });
 
-            this.datasets.show_reply = this.options.message.show_reply[0]>=0 && 
-                this.options.message.show_reply[0]<=this.datasets.thread_level &&
-                (this.options.message.show_reply[1]<0 || this.options.message.show_reply[1]>=this.datasets.thread_level);
-
-            this.datasets.show_read_unread = this.options.message.show_read_unread[0]>=0 && 
-                this.options.message.show_read_unread[0]<=this.datasets.thread_level &&
-                (this.options.message.show_read_unread[1]<0 || this.options.message.show_read_unread[1]>=this.datasets.thread_level);
+            this.datasets.show_reply_button = this.options.show_reply_button>this.datasets.thread_level;
+            this.datasets.show_read_unread_button = this.options.show_read_unread_button>this.datasets.thread_level;
 
             // record options and data
-            this.parent_thread= parent.messages!= undefined ? parent : options.options.thread._parents[0];
+            this.parent_thread= parent.messages!= undefined ? parent : options.options._parents[0];
             this.thread = false;
 
             if( this.datasets.id > 0 ) {
@@ -645,18 +632,14 @@ openerp.mail = function(session) {
             }
 
             /*create thread*/
-            self.thread = new mail.Thread(self, {
+            self.thread = new mail.Thread(self, self.datasets, {
                     'domain': self.domain,
                     'context':{
                         'default_model': self.datasets.model,
                         'default_res_id': self.datasets.res_id,
                         'default_parent_id': self.datasets.id
                     },
-                    'options': {
-                        'thread' : self.options.thread,
-                        'message' : self.options.message
-                    },
-                    'datasets': self.datasets
+                    'options': self.options
                 }
             );
             /*insert thread in parent message*/
@@ -697,8 +680,8 @@ openerp.mail = function(session) {
             var read = $(event.srcElement).hasClass("oe_read");
             this.$el.removeClass("oe_mail_" + (read?"un":"") + "read").addClass("oe_mail_" + (read?"":"un") + "read");
 
-            if( (read && this.options.thread.typeof_thread == 'inbox') ||
-                (!read && this.options.thread.typeof_thread == 'archives')) {
+            if( (read && this.options.typeof_thread == 'inbox') ||
+                (!read && this.options.typeof_thread == 'archives')) {
                 this.animated_destroy({fadeTime:250});
             }
 
@@ -717,8 +700,8 @@ openerp.mail = function(session) {
             // goto the wall thread for launch browse
             if(!options._go_thread_wall) {
                 options._go_thread_wall = true;
-                for(var i in this.options.thread._parents[0].messages){
-                    var res=this.options.thread._parents[0].messages[i].browse_message(options);
+                for(var i in this.options._parents[0].messages){
+                    var res=this.options._parents[0].messages[i].browse_message(options);
                     if(res) return res;
                 }
             }
@@ -788,7 +771,7 @@ openerp.mail = function(session) {
                     button.addClass('oe_stared');
                 } else {
                     button.removeClass('oe_stared');
-                    if( self.options.thread.typeof_thread == 'stared' ) {
+                    if( self.options.typeof_thread == 'stared' ) {
                         self.animated_destroy({fadeTime:250});
                     }
                 }
@@ -828,17 +811,15 @@ openerp.mail = function(session) {
          *              for each click on "show more message"
          *          @param {Number} [expandable_default_number=5] number message show
          *              on begin before the first click on "show more message"
-         *          @param {Array [A,B]} [display_on_thread] display the threads (hierarchy)
-         *              for the thread level between A and B. -1 for no begin or no end.
-         *              All thread before A are insert in the root thread.
-         *              All thread after B are insert in parent thread on B level.
+         *          @param {int} [display_indented_thread] number thread level to indented threads.
+         *              other are on flat mode
          *          @param {Select} [typeof_thread] inbox/archives/stared/sent
          *              type of thread and option for user application like animate
          *              destroy for read/unread
          *          @param {Array} [parents] liked with the parents thread
          *              use with browse, fetch... [O]= top parent
          */
-        init: function(parent, options) {
+        init: function(parent, datasets, options) {
             this._super(parent);
             this.domain = options.domain || [];
             this.context = _.extend({
@@ -847,36 +828,35 @@ openerp.mail = function(session) {
                 default_parent_id: false }, options.context || {});
 
             // options
-            this.options={
-                'thread' : {
-                    'expandable_number': options.options.thread.expandable_number || 5,
-                    'expandable_default_number': options.options.thread.expandable_default_number || 5,
-                    '_expandable_max': options.options.thread.expandable_default_number || 5,
-                    'display_on_thread': options.options.thread.display_on_thread || [0,-1],
-                    'typeof_thread': options.options.thread.typeof_thread || 'inbox',
-                    '_parents': (options.options.thread._parents != undefined ? options.options.thread._parents : []).concat( [this] )
-                },
-                'message' : options.options.message
-            };
+            this.options = _.extend(options.options, {
+                'expandable_number': options.options.expandable_number || 5,
+                'expandable_default_number': options.options.expandable_default_number || 5,
+                '_expandable_max': options.options.expandable_default_number || 5,
+                'display_indented_thread': options.options.display_indented_thread || -1,
+                'show_reply_button': options.options.show_reply_button || -1,
+                'typeof_thread': options.options.typeof_thread || 'inbox',
+                '_parents': (options.options._parents != undefined ? options.options._parents : []).concat( [this] )
+            });
 
             // record options and data
             this.parent_message= parent.thread!= undefined ? parent : false ;
 
-            var param = options.datasets
             // datasets and internal vars
             this.datasets = {
-                'id' : param.id || false,
-                'model' : param.model || false,
-                'parent_id' : param.parent_id || false,
-                'is_private' : param.is_private || false,
-                'author_id' : param.author_id || false,
-                'thread_level' : (param.thread_level+1) || 0,
+                'id' : datasets.id || false,
+                'model' : datasets.model || false,
+                'parent_id' : datasets.parent_id || false,
+                'is_private' : datasets.is_private || false,
+                'author_id' : datasets.author_id || false,
+                'thread_level' : (datasets.thread_level+1) || 0,
                 'partner_ids' : []
             };
 
-            for(var i in param.partner_ids){
-                if(param.partner_ids[i][0]!=(param.author_id ? param.author_id[0] : -1)){
-                    this.datasets.partner_ids.push(param.partner_ids[i]);
+            this.datasets.show_composeform = this.options.show_reply_button>this.datasets.thread_level;
+
+            for(var i in datasets.partner_ids){
+                if(datasets.partner_ids[i][0]!=(datasets.author_id ? datasets.author_id[0] : -1)){
+                    this.datasets.partner_ids.push(datasets.partner_ids[i]);
                 }
             }
 
@@ -889,16 +869,16 @@ openerp.mail = function(session) {
         
         start: function() {
             this._super.apply(this, arguments);
-            this.instantiate_ComposeMessage();
+            if(this.datasets.show_composeform){
+                this.instantiate_ComposeMessage();
+            }
             this.bind_events();
         },
 
         instantiate_ComposeMessage: function(){
-            this.ComposeMessage = new mail.ThreadComposeMessage(this,{
+            this.ComposeMessage = new mail.ThreadComposeMessage(this, this.datasets, {
                 'context': this.context,
-                'datasets': this.datasets,
                 'options': this.options,
-                'show_attachment_delete': true,
             });
 
             if(this.datasets.thread_level){
@@ -907,6 +887,7 @@ openerp.mail = function(session) {
                 // root view
                 this.ComposeMessage.prependTo(this.$el);
             }
+            this.ComposeMessage.$el.hide();
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -985,7 +966,7 @@ openerp.mail = function(session) {
             // goto the wall thread for launch browse
             if(!options._go_thread_wall) {
                 options._go_thread_wall = true;
-                return this.options.thread._parents[0].browse_thread(options);
+                return this.options._parents[0].browse_thread(options);
             }
 
             if(this.datasets.id==options.id){
@@ -1016,8 +997,8 @@ openerp.mail = function(session) {
          * @return thread object
          */
         browse_message: function(options){
-            if(this.options.thread._parents[0].messages[0])
-                return this.options.thread._parents[0].messages[0].browse_message(options);
+            if(this.options._parents[0].messages[0])
+                return this.options._parents[0].messages[0].browse_message(options);
         },
 
         /* this function is launch when a user click on "Reply" button
@@ -1043,13 +1024,13 @@ openerp.mail = function(session) {
             var self = this;
 
             // initial mode: try to use message_data or message_ids
-            if (initial_mode && this.options.thread.message_data) {
+            if (initial_mode && this.options.message_data) {
                 return this.create_message_object(this.options.message_data);
             }
             // domain and context: options + additional
             fetch_domain = replace_domain ? replace_domain : this.domain;
             fetch_context = replace_context ? replace_context : this.context;
-            fetch_context.message_loaded= [this.datasets.id||0].concat( self.options.thread._parents[0].get_child_ids() );
+            fetch_context.message_loaded= [this.datasets.id||0].concat( self.options._parents[0].get_child_ids() );
 
             return this.ds_message.call('message_read', [ids, fetch_domain, 0, fetch_context, this.context.default_parent_id || undefined]
                 ).then(function (records) { self.switch_new_message(records); });
@@ -1061,28 +1042,22 @@ openerp.mail = function(session) {
             var self = this;
 
             if(data.type=='expandable'){
-                var message = new mail.ThreadExpandable(self, {
+                var message = new mail.ThreadExpandable(self, data, {
                     'domain': data.domain,
                     'context': {
                         'default_model': data.model || self.context.default_model,
                         'default_res_id': data.res_id || self.context.default_res_id,
                         'default_parent_id': self.datasets.id },
-                    'datasets': data
                 });
             } else {
-                var message = new mail.ThreadMessage(self, {
+                var message = new mail.ThreadMessage(self, _.extend(data, {'thread_level': self.datasets.thread_level}), {
                     'domain': data.domain,
                     'context': {
                         'default_model': data.model,
                         'default_res_id': data.res_id,
                         'default_parent_id': data.id },
-                    'options':{
-                        'thread': self.options.thread,
-                        'message': self.options.message
-                    },
-                    'datasets': _.extend(data, {'thread_level': self.datasets.thread_level})
+                    'options': self.options
                 });
-                var data = _.extend(data, {'thread_level': self.datasets.thread_level});
             }
 
             // check if the message is already create
@@ -1100,83 +1075,66 @@ openerp.mail = function(session) {
         insert_message: function (message) {
             var self=this;
 
+            this.ComposeMessage.$el.show();
+
             this.$('.oe_wall_no_message').remove();
 
             // insert on hierarchy display => insert in self child
             var thread_messages = self.messages;
             var thread = self;
-            var flat = false;
-            var hierarchy = self.options.thread.display_on_thread;
-            if( hierarchy[0] < 0 ||
-                hierarchy[0] > self.datasets.thread_level ||
-                (hierarchy[1]>0 && hierarchy[1] < self.datasets.thread_level) ) {
-
-                var flat = true;
-
-                if(hierarchy[0]<0){
-                
-                    // all is in flat mode
-                    thread =  self.options.thread._parents[0];
-                    var nb_thread_level = null;
-                
-                } else if(hierarchy[0] > self.datasets.thread_level) {
-                 
-                    // list all childs messages for flat display before the hierarchy
-                    thread =  self.options.thread._parents[0];
-                    var nb_thread_level = hierarchy[0];
-                
-                } else if(hierarchy[1] < self.datasets.thread_level) {
-                
-                    // list all childs messages for flat display after the hierarchy
-                    thread =  self.options.thread._parents[hierarchy[1]];
-                    var nb_thread_level = hierarchy[1]>0 ? hierarchy[1]-hierarchy[0] : null;
-                } else {
-
-                    thread =  self.options.thread._parents[0];
-                    var nb_thread_level = null;
-                }
-
+            if( self.options.display_indented_thread < self.datasets.thread_level ) {
+                var thread =  self.options._parents[self.options.display_indented_thread] || self.options._parents[0];
                 var thread_messages = [];
-                _(thread.get_childs( nb_thread_level )).each(function (val, key) { thread_messages.push(val.parent_message); });
+                _(thread.get_childs()).each(function (val, key) { thread_messages.push(val.parent_message); });
             }
 
             // check older and newer message for insert
             var parent_newer = false;
             var parent_older = false;
-            if ( message.datasets.id > 0 ){
-                for(var i in thread_messages){
-                    if(thread_messages[i].datasets.id > message.datasets.id){
-                        if(!parent_newer || parent_newer.datasets.id>=thread_messages[i].datasets.id)
-                            parent_newer = thread_messages[i];
-                    } else if(thread_messages[i].datasets.id>0 && thread_messages[i].datasets.id < message.datasets.id) {
-                        if(!parent_older || parent_older.id<thread_messages[i].datasets.id)
-                            parent_older = thread_messages[i];
+            for(var i in thread_messages){
+                if((thread_messages[i].datasets.id > message.datasets.id && message.datasets.id > 0) || 
+                    thread_messages[i].datasets.id < 0){
+                    if(!parent_newer || 
+                        thread_messages[i].datasets.id < 0 || 
+                        parent_newer.datasets.id >= thread_messages[i].datasets.id) {
+                        parent_newer = thread_messages[i];
+                    }
+                } else if((thread_messages[i].datasets.id > 0 && thread_messages[i].datasets.id < message.datasets.id) || message.datasets.id < 0) {
+                    if(!parent_older || 
+                        parent_older.datasets.id < thread_messages[i].datasets.id) {
+                        parent_older = thread_messages[i];
                     }
                 }
             }
 
-            var sort = self.datasets.thread_level==0 || (flat && self.datasets.thread_level>=1);
+            var sort = self.datasets.thread_level;
 
             if(parent_older){
                 if(sort){
-                    message.insertBefore(parent_older.$el);
-                } else {
                     message.insertAfter(parent_older.thread ? parent_older.thread.$el : parent_older.$el);
+                } else {
+                    message.insertBefore(parent_older.$el);
                 }
             } else if(parent_newer){
-                if(sort){
-                    message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
-                } else {
+                if(sort || parent_newer.datasets.id<0){
                     message.insertBefore(parent_newer.$el);
+                } else {
+                    message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
                 }
             } else {
-                if(sort && message.id > 0){
+                if(sort) {
                     message.prependTo(thread.$el);
                 } else {
                     message.appendTo(thread.$el);
                 }
             }
 
+            // must be improve by CHM (temporary test for DOM)
+            self.options._parents[0].$('.oe_msg_comment:first, .oe_thread .oe_msg_comment:first').addClass("oe_msg_first");
+            self.options._parents[0].$('.oe_thread:has(.oe_msg_comment:visible) + .oe_msg').addClass("oe_msg_group_first");
+            self.options._parents[0].$('.oe_msg_comment:last, .oe_thread .oe_msg_comment:last').addClass("oe_msg_last");
+            self.options._parents[0].$('.oe_thread:not(:has(.oe_msg:visible)) ~ .oe_thread:has(.oe_thread .oe_msg:visible)').addClass("oe_msg_group_last");
+            
             return message
         },
         
@@ -1218,14 +1176,10 @@ openerp.mail = function(session) {
          *      display before having a "show more" link; note that the text
          *      will not be truncated if it does not have 110% of the parameter
          *...  @param {Boolean} [show_record_name] display the name and link for do action
-         *...  @param {Array [A,B]} [show_reply] display the reply button on the
-         *      message for thread level between A and B. -1 for no begin or no end.
-         *...  @param {Array [A,B]} [show_read_unread] display the read/unread button on the
-         *      message for thread level between A and B. -1 for no begin or no end.
-         *...  @param {Array [A,B]} [display_on_thread] display the threads (hierarchy)
-         *      for the thread level between A and B. -1 for no begin or no end.
-         *      All thread before A are insert in the root thread.
-         *      All thread after B are insert in parent thread on B level.
+         *...  @param {int} [show_reply_button] number thread level to display the reply button
+         *...  @param {int} [show_read_unread_button] number thread level to display the read/unread button
+         *...  @param {int} [display_indented_thread] number thread level to indented threads.
+         *      other are on flat mode
          */
         init: function (parent, options) {
             this._super(parent);
@@ -1245,24 +1199,18 @@ openerp.mail = function(session) {
          * Display the threads
           */
         message_render: function (search) {
-            this.thread = new mail.Thread(this, {
-                    'domain' : this.options.domain,
-                    'context' : this.options.context,
-                    'options': {
-                        'thread' :{
-                            'typeof_thread': this.options.typeof_thread || 'inbox',
-                            'display_on_thread': this.options.display_on_thread || [0,1]
-                        },
-                        'message': {
-                            'show_reply': this.options.show_reply || [0,0],
-                            'show_read_unread': this.options.show_read_unread || [0,-1],
-                            'truncate_limit': this.options.truncate_limit || 250,
-                            'show_record_name': this.options.show_record_name || false,
-                        },
-                    },
-                    'datasets': {},
-                }
-            );
+            this.thread = new mail.Thread(this, {}, {
+                'domain' : this.options.domain,
+                'context' : this.options.context,
+                'options': {
+                    'typeof_thread': this.options.typeof_thread || 'inbox',
+                    'display_indented_thread': this.options.display_indented_thread || 1,
+                    'show_reply_button': this.options.show_reply_button || 1,
+                    'show_read_unread_button': this.options.show_read_unread_button || 1,
+                    'truncate_limit': this.options.truncate_limit || 250,
+                    'show_record_name': this.options.show_record_name || false,
+                },
+            });
 
             this.thread.appendTo( this.$el );
             this.thread.no_message();
@@ -1328,9 +1276,9 @@ openerp.mail = function(session) {
                     'domain': domain,
                     'context': this.options.context,
                     'typeof_thread': this.options.context.typeof_thread || 'other',
-                    'display_on_thread':[-1,-1],
-                    'show_reply': [-1,-1],
-                    'show_read_unread': [-1,-1],
+                    'display_indented_thread': false,
+                    'show_reply_button': false,
+                    'show_read_unread_button': false,
                 }
             );
 
@@ -1424,9 +1372,9 @@ openerp.mail = function(session) {
                 'domain' : domain,
                 'context' : context,
                 'typeof_thread': context.typeof_thread || 'other',
-                'display_on_thread': [0,1],
-                'show_reply': [0,0],
-                'show_read_unread': [0,-1],
+                'display_indented_thread': 2,
+                'show_reply_button': 2,
+                'show_read_unread_button': 3,
                 }
             );
             return this.root.appendTo( this.$('.oe_mail_wall_threads:first') );
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1980c9661f7..5008e60a1ed 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -82,7 +82,7 @@
                     <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
-                    <t t-if="widget.options.thread.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
+                    <t t-if="widget.options.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
                         <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
                     </t>
 
@@ -209,7 +209,7 @@
                         <t t-raw="widget.datasets.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <t t-if="widget.options.message.show_record_name and widget.datasets.record_name and (!widget.datasets.subject) and !widget.options.thread.thread_level and !widget.options.thread.display_on_thread[0] and widget.datasets.model!='res.partner'">
+                        <t t-if="widget.options.show_record_name and widget.datasets.record_name and (!widget.datasets.subject) and !widget.options.thread_level and !widget.options.display_on_thread[0] and widget.datasets.model!='res.partner'">
                             <a class="oe_mail_action_model" t-attf-href="#model=#{widget.datasets.model}&amp;id=#{widget.datasets.res_id}"><t t-raw="widget.datasets.record_name"/></a>
                         </t>
                         <t t-raw="widget.datasets.body"/>

From a670da21e4097b31cb8f433af9b9bdf9b93e748e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 09:44:49 +0200
Subject: [PATCH 013/106] [FIX] mail: search for the thread message widget

bzr revid: chm@openerp.com-20121019074449-5n0vylf3zoqwb2hr
---
 addons/mail/static/src/js/mail.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b5eb57a1056..37cfbfa75d1 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1130,9 +1130,12 @@ openerp.mail = function(session) {
             }
 
             // must be improve by CHM (temporary test for DOM)
-            self.options._parents[0].$('.oe_msg_comment:first, .oe_thread .oe_msg_comment:first').addClass("oe_msg_first");
+            self.$('.oe_msg_first').removeClass("oe_msg_first");
+            self.$('.oe_msg_comment:first, .oe_thread .oe_msg_comment:first').addClass("oe_msg_first");
+            self.$('.oe_msg_last').removeClass("oe_msg_last");
+            self.$('.oe_msg_comment:last, .oe_thread .oe_msg_comment:last').addClass("oe_msg_last");
+
             self.options._parents[0].$('.oe_thread:has(.oe_msg_comment:visible) + .oe_msg').addClass("oe_msg_group_first");
-            self.options._parents[0].$('.oe_msg_comment:last, .oe_thread .oe_msg_comment:last').addClass("oe_msg_last");
             self.options._parents[0].$('.oe_thread:not(:has(.oe_msg:visible)) ~ .oe_thread:has(.oe_thread .oe_msg:visible)').addClass("oe_msg_group_last");
             
             return message
@@ -1336,7 +1339,7 @@ openerp.mail = function(session) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, false, defaults || {}, hidden || false);
             return this.searchview.appendTo(this.$('.oe_view_manager_view_search')).then(function () {
-                self.searchview.on_search.add(self.do_searchview_search);
+                self.searchview.on('search_data', self, self.do_searchview_search);
             });
         },
 
@@ -1356,7 +1359,7 @@ openerp.mail = function(session) {
             }).then(function (results) {
                 self.search_results['context'] = results.context;
                 self.search_results['domain'] = results.domain;
-                self.thread.destroy();
+                self.root.destroy();
                 return self.message_render();
             });
         },

From 7f9da8b853a2100eae1b9ec91a87abb5133f2267 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 10:19:26 +0200
Subject: [PATCH 014/106] [IMP] mail: js add class on dom for CSS

bzr revid: chm@openerp.com-20121019081926-0gevpfwb75k3ye93
---
 addons/mail/static/src/css/mail.css | 11 +++++++++++
 addons/mail/static/src/js/mail.js   | 12 ++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9d317f714d7..8261478319a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -83,3 +83,14 @@
 .openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
     display:none;
 }
+
+.openerp .oe_mail .oe_msg_last {
+    border-bottom: 5px solid black;
+    border-left: 2px solid black;
+    border-right: 2px solid black;
+}
+.openerp .oe_mail .oe_msg_first {
+    border-top: 5px solid black;
+    border-left: 2px solid black;
+    border-right: 2px solid black;
+}
\ 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 37cfbfa75d1..f1844890402 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1129,15 +1129,11 @@ openerp.mail = function(session) {
                 }
             }
 
-            // must be improve by CHM (temporary test for DOM)
-            self.$('.oe_msg_first').removeClass("oe_msg_first");
-            self.$('.oe_msg_comment:first, .oe_thread .oe_msg_comment:first').addClass("oe_msg_first");
-            self.$('.oe_msg_last').removeClass("oe_msg_last");
-            self.$('.oe_msg_comment:last, .oe_thread .oe_msg_comment:last').addClass("oe_msg_last");
+            self.$('.oe_msg_first:first').removeClass("oe_msg_first");
+            self.$('.oe_msg_last:last').removeClass("oe_msg_last");
+            self.$('.oe_msg_comment:first, .oe_msg_comment:first-child').addClass("oe_msg_first");
+            self.$('.oe_msg_comment:last, .oe_msg_comment:last-child').addClass("oe_msg_last");
 
-            self.options._parents[0].$('.oe_thread:has(.oe_msg_comment:visible) + .oe_msg').addClass("oe_msg_group_first");
-            self.options._parents[0].$('.oe_thread:not(:has(.oe_msg:visible)) ~ .oe_thread:has(.oe_thread .oe_msg:visible)').addClass("oe_msg_group_last");
-            
             return message
         },
         

From 62fad9c114a5c21ea7d564beca45c67e496993e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 19 Oct 2012 12:03:50 +0200
Subject: [PATCH 015/106] [IMP] mail: removed first/last message classes

bzr revid: fva@openerp.com-20121019100350-6egth3faj7uoci6u
---
 addons/mail/static/src/css/mail.css | 11 -----------
 addons/mail/static/src/js/mail.js   |  5 -----
 2 files changed, 16 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 8261478319a..9d317f714d7 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -83,14 +83,3 @@
 .openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
     display:none;
 }
-
-.openerp .oe_mail .oe_msg_last {
-    border-bottom: 5px solid black;
-    border-left: 2px solid black;
-    border-right: 2px solid black;
-}
-.openerp .oe_mail .oe_msg_first {
-    border-top: 5px solid black;
-    border-left: 2px solid black;
-    border-right: 2px solid black;
-}
\ 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 7603490ded5..6d8f31c9ac7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1124,11 +1124,6 @@ openerp.mail = function(session) {
                 }
             }
 
-            self.$('.oe_msg_first:first').removeClass("oe_msg_first");
-            self.$('.oe_msg_last:last').removeClass("oe_msg_last");
-            self.$('.oe_msg_comment:first, .oe_msg_comment:first-child').addClass("oe_msg_first");
-            self.$('.oe_msg_comment:last, .oe_msg_comment:last-child').addClass("oe_msg_last");
-
             return message
         },
         

From 7de23b01f540d52811e9263fa453831219515605 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 12:21:17 +0200
Subject: [PATCH 016/106] [IMP] mail: auto open and close the compose form on
 the threads

bzr revid: chm@openerp.com-20121019102117-rzpdmkrbi7xhynpf
---
 addons/mail/mail_message.py         |  14 ++--
 addons/mail/static/src/js/mail.js   | 100 +++++++++++++++++++---------
 addons/mail/static/src/xml/mail.xml |  13 ++--
 3 files changed, 78 insertions(+), 49 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4fac2db1061..989b63afee5 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -350,8 +350,6 @@ class mail_message(osv.Model):
         read_messages = {}
         message_list = []
 
-        print message_loaded_ids
-
         # specific IDs given: fetch those ids and return directly the message list
         if ids:
             for message in self.read(cr, uid, ids, self._message_read_fields, context=context):
@@ -377,15 +375,11 @@ class mail_message(osv.Model):
                             message_list.append(self._message_get_dict(cr, uid, parent, context=context))
                         parent = self._get_parent(cr, uid, parent, context=context)
 
-                # print read_messages
-                # print message_list
+            # get the child expandable messages for the tree
+            message_list = sorted(message_list, key=lambda k: k['id'])
+            message_list = self._message_read_expandable(cr, uid, message_list, read_messages,
+                message_loaded_ids=message_loaded_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
 
-                # get the child expandable messages for the tree
-                message_list = sorted(message_list, key=lambda k: k['id'])
-                # message_list = self._message_read_expandable(cr, uid, message_list, read_messages,
-                #     message_loaded_ids=message_loaded_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
-
-        # message_list = sorted(message_list, key=lambda k: k['id'])
         return message_list
 
     # TDE Note: do we need this ?
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7603490ded5..9d90b592dc1 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -113,6 +113,7 @@ openerp.mail = function(session) {
          *          mail.compose.message DataSetSearch. Please refer to this model
          *          for more details about fields and default values.
          */
+
         init: function (parent, datasets, options) {
             var self = this;
             this._super(parent);
@@ -122,6 +123,7 @@ openerp.mail = function(session) {
                 'attachment_ids' : [],
                 'id': datasets.id,
                 'model': datasets.model,
+                'show_compact': true,
                 'res_model': datasets.res_model,
                 'is_private': datasets.is_private || false,
                 'partner_ids': datasets.partner_ids || [],
@@ -137,10 +139,20 @@ openerp.mail = function(session) {
 
             this.fileupload_id = _.uniqueId('oe_fileupload_temp');
             $(window).on(self.fileupload_id, self.on_attachment_loaded);
+
+            this.$render_expandable = false;
+            this.$render_compact = false;
         },
 
         start: function(){
-            this.display_attachments();
+            this.$render_compact = this.$el;
+
+            if(this.datasets.show_compact) {
+                this.$render_compact.show();
+            } else {
+                this.$render_compact.hide();
+            }
+
             this.bind_events();
         },
 
@@ -270,7 +282,8 @@ openerp.mail = function(session) {
             this.$el.on('click', 'a.oe_cancel', self.on_cancel );
             this.$el.on('click', 'button.oe_post', function(){self.on_message_post()} );
             this.$el.on('click', 'button.oe_full', function(){self.on_compose_fullmail()} );
-            self.$el.on('focus', 'textarea.oe_compact', self.on_compose_expandable);
+
+            this.$('textarea.oe_compact').on('focus', self.on_compose_expandable);
         },
 
         on_compose_fullmail: function(){
@@ -353,22 +366,52 @@ openerp.mail = function(session) {
 
         /* convert the compact mode into the compose message
         */
-        on_compose_expandable: function(){
-            var $render = $(session.web.qweb.render('mail.compose_message', {'widget': this}));
-            this.$el.replaceWith( $render );
-            this.$el = $render;
-            this.$('textarea').focus();
-            this.bind_events();
+        on_compose_expandable: function(event){
+            if(event) event.stopPropagation();
+
+            var self = this;
+
+            if(!this.$render_expandable) {
+                this.$render_expandable = $(session.web.qweb.render('mail.compose_message', {'widget': this}));
+                this.$render_expandable.hide();
+
+                this.$render_expandable.insertAfter( this.$render_compact );
+                this.display_attachments();
+                
+                this.$render_expandable.on('blur', 'textarea', this.on_compose_expandable);
+
+                /* stack for don't close the compose form if the user click on a button */
+                this.$render_expandable.on('focus', 'textarea', function () { self.stay_open = false; });
+                this.$render_expandable.on('mousedown', function () { self.stay_open = true; });
+            }
+            if(this.$render_expandable.is(':hidden')){
+
+                this.$render_expandable.show();
+                this.$render_compact.hide();
+                this.$render_expandable.find('textarea').focus();
+
+            } else if(!this.stay_open){
+
+                this.$render_expandable.hide();
+                if(this.datasets.show_compact) {
+                    this.$render_compact.show();
+                } else {
+                    this.$render_compact.hide();
+                }
+
+            }
+            return true;
         },
 
-        /* convert the compact mode into the compose message
-        */
-        on_compose_compact: function(){
-            var $render = $(session.web.qweb.render('mail.compose_message.compact', {'widget': this}));
-            this.$el.replaceWith( $render );
-            this.$el = $render;
-            this.bind_events();
+        do_hide_compact: function() {
+            this.$render_compact.hide();
+            this.datasets.show_compact = false;
         },
+
+        do_show_compact: function() {
+            this.$render_compact.show();
+            this.datasets.show_compact = true;
+        }
     });
 
     /** 
@@ -507,7 +550,7 @@ openerp.mail = function(session) {
                 'name' : false,
                 'record_name' : false,
                 'body' : false,
-                'vote_user_ids' :[],
+                'vote_nb' :0,
                 'has_voted' : false,
                 'is_favorite' : false,
                 'thread_level' : 0,
@@ -595,8 +638,8 @@ openerp.mail = function(session) {
             this.$el.on('click', 'a.oe_reply', this.on_message_reply);
             // event: click on 'Vote' button
             this.$el.on('click', 'button.oe_msg_vote', this.on_vote);
-            // event: click on 'Star' button
-            this.$el.on('click', 'button.oe_mail_starbox', this.on_star);
+            // event: click on 'starred/favorite' button
+            this.$el.on('click', 'a.oe_mail_starbox', this.on_star);
         },
 
         on_message_reply:function(event){
@@ -727,17 +770,7 @@ openerp.mail = function(session) {
             return this.ds_message.call('vote_toggle', [[self.datasets.id]]).pipe(function(vote){
 
                 self.datasets.has_voted=vote;
-                if (!self.datasets.has_voted) {
-                    var votes=[];
-                    for(var i in self.datasets.vote_user_ids){
-                        if(self.datasets.vote_user_ids[i][0]!=self.session.uid)
-                            vote.push(self.datasets.vote_user_ids[i]);
-                    }
-                    self.datasets.vote_user_ids=votes;
-                }
-                else {
-                    self.datasets.vote_user_ids.push([self.session.uid, 'You']);
-                }
+                self.datasets.vote_nb += self.datasets.has_voted ? 1 : -1;
                 self.display_vote();
             });
             return false;
@@ -747,8 +780,8 @@ openerp.mail = function(session) {
         display_vote: function () {
             var self = this;
             var vote_element = session.web.qweb.render('mail.thread.message.vote', {'widget': self});
-            self.$(".placeholder-mail-vote:first").empty();
-            self.$(".placeholder-mail-vote:first").html(vote_element);
+            self.$(".oe_msg_vote:first").remove();
+            self.$(".oe_mail_vote_count:first").replaceWith(vote_element);
         },
 
         // Stared/unstared + Render star.
@@ -880,7 +913,7 @@ openerp.mail = function(session) {
                 // root view
                 this.ComposeMessage.prependTo(this.$el);
             }
-            this.ComposeMessage.$el.hide();
+            this.ComposeMessage.do_hide_compact();
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -1069,7 +1102,7 @@ openerp.mail = function(session) {
             var self=this;
 
             if(this.datasets.show_composeform){
-                this.ComposeMessage.$el.show();
+                this.ComposeMessage.do_show_compact();
             }
 
             this.$('.oe_wall_no_message').remove();
@@ -1203,6 +1236,7 @@ openerp.mail = function(session) {
                     'show_read_unread_button': this.options.show_read_unread_button || 1,
                     'truncate_limit': this.options.truncate_limit || 250,
                     'show_record_name': this.options.show_record_name || false,
+                    'show_header_compose': this.options.show_header_compose || false
                 },
             });
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 651f0588868..f8c4ce92d1c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -190,9 +190,9 @@
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply" title="Reply" class="oe_reply oe_e">)</a>
+                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
+                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
+                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
                 </div>
             </div>
 
@@ -258,11 +258,12 @@
             <t t-if='widget.datasets.has_voted'>
                 You
             </t>
-            <t t-if='(widget.datasets.vote_user_ids.length-(widget.datasets.has_voted?1:0)) > 0'>
+            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
                 <t t-if='widget.datasets.has_voted'> and </t>
-                <t t-esc="widget.datasets.vote_user_ids.length"/> people
+                <t t-esc="widget.datasets.vote_nb"/> people
             </t>
-            <t t-if='widget.datasets.vote_user_ids.length > 0'>
+            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
+                <t t-raw="(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0))"/>
                 concur
             </t>
         </span>

From dfa34c02540cbb84ad6018ad62582574c4e959b9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 13:39:51 +0200
Subject: [PATCH 017/106] [IMP] mail: auto open and close the compose form on
 the threads

bzr revid: chm@openerp.com-20121019113951-pz44iipv45misvgk
---
 addons/mail/mail_message.py         |  14 +--
 addons/mail/static/src/css/mail.css |  14 +--
 addons/mail/static/src/js/mail.js   | 188 +++++++++++++++++-----------
 addons/mail/static/src/xml/mail.xml |  17 +--
 4 files changed, 132 insertions(+), 101 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4fac2db1061..989b63afee5 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -350,8 +350,6 @@ class mail_message(osv.Model):
         read_messages = {}
         message_list = []
 
-        print message_loaded_ids
-
         # specific IDs given: fetch those ids and return directly the message list
         if ids:
             for message in self.read(cr, uid, ids, self._message_read_fields, context=context):
@@ -377,15 +375,11 @@ class mail_message(osv.Model):
                             message_list.append(self._message_get_dict(cr, uid, parent, context=context))
                         parent = self._get_parent(cr, uid, parent, context=context)
 
-                # print read_messages
-                # print message_list
+            # get the child expandable messages for the tree
+            message_list = sorted(message_list, key=lambda k: k['id'])
+            message_list = self._message_read_expandable(cr, uid, message_list, read_messages,
+                message_loaded_ids=message_loaded_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
 
-                # get the child expandable messages for the tree
-                message_list = sorted(message_list, key=lambda k: k['id'])
-                # message_list = self._message_read_expandable(cr, uid, message_list, read_messages,
-                #     message_loaded_ids=message_loaded_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
-
-        # message_list = sorted(message_list, key=lambda k: k['id'])
         return message_list
 
     # TDE Note: do we need this ?
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 8261478319a..f8bbe99dbef 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -51,6 +51,9 @@
     padding-left: 4px;
     overflow: hidden;
 }
+.openerp .oe_mail .oe_msg.oe_msg_composer .oe_msg_footer{
+    height: auto;
+}
 .openerp .oe_mail .oe_msg .oe_msg_content{
     display: block;
     overflow: hidden;
@@ -83,14 +86,3 @@
 .openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
     display:none;
 }
-
-.openerp .oe_mail .oe_msg_last {
-    border-bottom: 5px solid black;
-    border-left: 2px solid black;
-    border-right: 2px solid black;
-}
-.openerp .oe_mail .oe_msg_first {
-    border-top: 5px solid black;
-    border-left: 2px solid black;
-    border-right: 2px solid black;
-}
\ 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 7603490ded5..ac7e01b40e5 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -113,6 +113,7 @@ openerp.mail = function(session) {
          *          mail.compose.message DataSetSearch. Please refer to this model
          *          for more details about fields and default values.
          */
+
         init: function (parent, datasets, options) {
             var self = this;
             this._super(parent);
@@ -122,6 +123,7 @@ openerp.mail = function(session) {
                 'attachment_ids' : [],
                 'id': datasets.id,
                 'model': datasets.model,
+                'show_compact': true,
                 'res_model': datasets.res_model,
                 'is_private': datasets.is_private || false,
                 'partner_ids': datasets.partner_ids || [],
@@ -137,10 +139,20 @@ openerp.mail = function(session) {
 
             this.fileupload_id = _.uniqueId('oe_fileupload_temp');
             $(window).on(self.fileupload_id, self.on_attachment_loaded);
+
+            this.$render_expandable = false;
+            this.$render_compact = false;
         },
 
         start: function(){
-            this.display_attachments();
+            this.$render_compact = this.$el;
+
+            if(this.datasets.show_compact) {
+                this.$render_compact.show();
+            } else {
+                this.$render_compact.hide();
+            }
+
             this.bind_events();
         },
 
@@ -150,14 +162,14 @@ openerp.mail = function(session) {
             var self = this;
             var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self}));
             if(!this.list_attachment){
-                this.$('.oe_msg_attachment_list').replaceWith( render );
+                this.$render_expandable.find('.oe_msg_attachment_list').replaceWith( render );
             } else {
                 this.list_attachment.replaceWith( render );
             }
-            this.list_attachment = this.$(".oe_msg_attachments");
+            this.list_attachment = this.$render_expandable.find(".oe_msg_attachments");
 
             // event: delete an attachment
-            this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
+            this.$render_expandable.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
         },
 
         /* when a user click on the upload button, send file read on_attachment_loaded
@@ -185,10 +197,9 @@ openerp.mail = function(session) {
                 this.datasets.attachment_ids = attachments;
 
                 // submit file
-                //session.web.blockUI();
-                self.$('form.oe_form_binary_form').submit();
+                this.$render_expandable.find('form.oe_form_binary_form').submit();
 
-                this.$(".oe_attachment_file").hide();
+                this.$render_expandable.find(".oe_attachment_file").hide();
 
                 this.datasets.attachment_ids.push({
                     'id': 0,
@@ -204,7 +215,6 @@ openerp.mail = function(session) {
         /* when the file is uploaded 
         */
         on_attachment_loaded: function (event, result) {
-            //session.web.unblockUI();
             for(var i in this.datasets.attachment_ids){
                 if(this.datasets.attachment_ids[i].filename == result.filename && this.datasets.attachment_ids[i].upload) {
                     this.datasets.attachment_ids[i]={
@@ -217,9 +227,9 @@ openerp.mail = function(session) {
             }
             this.display_attachments();
 
-            var $input = this.$('input.oe_form_binary_file');
+            var $input = this.$render_expandable.find('input.oe_form_binary_file');
             $input.after($input.clone(true)).remove();
-            this.$(".oe_attachment_file").show();
+            this.$render_expandable.find(".oe_attachment_file").show();
         },
 
         /* unlink the file on the server and reload display
@@ -265,12 +275,24 @@ openerp.mail = function(session) {
         bind_events: function() {
             var self = this;
 
-            // set the function called when attachments are added
-            this.$el.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
-            this.$el.on('click', 'a.oe_cancel', self.on_cancel );
-            this.$el.on('click', 'button.oe_post', function(){self.on_message_post()} );
-            this.$el.on('click', 'button.oe_full', function(){self.on_compose_fullmail()} );
-            self.$el.on('focus', 'textarea.oe_compact', self.on_compose_expandable);
+            this.$render_compact.find('textarea').unbind().on('focus', self.on_compose_expandable);
+
+            if(this.$render_expandable){
+                // set the function called when attachments are added
+                this.$render_expandable.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
+
+                this.$render_expandable.on('click', 'a.oe_cancel', self.on_cancel );
+                this.$render_expandable.on('click', 'button.oe_post', function(){self.on_message_post()} );
+                this.$render_expandable.on('click', 'button.oe_full', function(){self.on_compose_fullmail()} );
+
+                // auto close
+                this.$render_expandable.on('blur', 'textarea', this.on_compose_expandable);
+
+                /* stack for don't close the compose form if the user click on a button */
+                this.$render_expandable.on('focus', 'textarea', function () { self.stay_open = false; });
+                this.$render_expandable.on('mousedown', function () { self.stay_open = true; });
+            }
+
         },
 
         on_compose_fullmail: function(){
@@ -292,11 +314,11 @@ openerp.mail = function(session) {
                 views: [[false, 'form']],
                 target: 'new',
                 context: {
-                    'default_model': false,
-                    'default_res_id': 0,
+                    'default_model': this.context.default_model,
+                    'default_res_id': this.context.default_res_id,
                     'default_content_subtype': 'html',
                     'default_parent_id': this.datasets.id,
-                    'default_body': mail.ChatterUtils.get_text2html(this.$('textarea').val() || ''),
+                    'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable.find('textarea').val() || ''),
                     'default_attachment_ids': attachments,
                     'default_partner_ids': partner_ids
                 },
@@ -306,11 +328,13 @@ openerp.mail = function(session) {
 
         on_cancel: function(event){
             if(event) event.stopPropagation();
-            this.$('textarea').val("");
-            this.$('input[data-id]').remove();
-            //this.attachment_ids=[];
+            this.$render_expandable.find('textarea').val("");
+            this.$render_expandable.find('input[data-id]').remove();
+
+            this.datasets.attachment_ids=[];
             this.display_attachments();
-            this.$el.hide();
+
+            this.on_compose_expandable();
         },
 
         /*post a message and fetch the message*/
@@ -318,7 +342,7 @@ openerp.mail = function(session) {
             var self = this;
 
             if (! body) {
-                var comment_node = this.$('textarea');
+                var comment_node =  this.$render_expandable.find('textarea');
                 var body = comment_node.val();
                 comment_node.val('');
             }
@@ -333,6 +357,7 @@ openerp.mail = function(session) {
             }
 
             if(body.match(/\S+/)) {
+                session.web.blockUI();
                 this.parent_thread.ds_thread.call('message_post_api', [
                         this.context.default_res_id, 
                         mail.ChatterUtils.get_text2html(body), 
@@ -344,8 +369,8 @@ openerp.mail = function(session) {
                         this.parent_thread.context
                     ]).then(function(records){
                         self.parent_thread.switch_new_message(records);
-                        self.datasets.attachment_ids=[];
                         self.on_cancel();
+                        session.web.unblockUI();
                     });
                 return true;
             }
@@ -353,22 +378,48 @@ openerp.mail = function(session) {
 
         /* convert the compact mode into the compose message
         */
-        on_compose_expandable: function(){
-            var $render = $(session.web.qweb.render('mail.compose_message', {'widget': this}));
-            this.$el.replaceWith( $render );
-            this.$el = $render;
-            this.$('textarea').focus();
-            this.bind_events();
+        on_compose_expandable: function(event){
+            if(event) event.stopPropagation();
+
+            var self = this;
+
+            if(!this.$render_expandable) {
+                this.$render_expandable = $(session.web.qweb.render('mail.compose_message', {'widget': this}));
+                this.$render_expandable.hide();
+
+                this.$render_expandable.insertAfter( this.$render_compact );
+                this.display_attachments();
+
+                this.bind_events();
+            }
+            if(this.$render_expandable.is(':hidden')){
+
+                this.$render_expandable.show();
+                this.$render_compact.hide();
+                this.$render_expandable.find('textarea').focus();
+
+            } else if(!this.stay_open){
+
+                this.$render_expandable.hide();
+                if(this.datasets.show_compact) {
+                    this.$render_compact.show();
+                } else {
+                    this.$render_compact.hide();
+                }
+
+            }
+            return true;
         },
 
-        /* convert the compact mode into the compose message
-        */
-        on_compose_compact: function(){
-            var $render = $(session.web.qweb.render('mail.compose_message.compact', {'widget': this}));
-            this.$el.replaceWith( $render );
-            this.$el = $render;
-            this.bind_events();
+        do_hide_compact: function() {
+            this.$render_compact.hide();
+            this.datasets.show_compact = false;
         },
+
+        do_show_compact: function() {
+            this.$render_compact.show();
+            this.datasets.show_compact = true;
+        }
     });
 
     /** 
@@ -507,7 +558,7 @@ openerp.mail = function(session) {
                 'name' : false,
                 'record_name' : false,
                 'body' : false,
-                'vote_user_ids' :[],
+                'vote_nb' :0,
                 'has_voted' : false,
                 'is_favorite' : false,
                 'thread_level' : 0,
@@ -595,8 +646,8 @@ openerp.mail = function(session) {
             this.$el.on('click', 'a.oe_reply', this.on_message_reply);
             // event: click on 'Vote' button
             this.$el.on('click', 'button.oe_msg_vote', this.on_vote);
-            // event: click on 'Star' button
-            this.$el.on('click', 'button.oe_mail_starbox', this.on_star);
+            // event: click on 'starred/favorite' button
+            this.$el.on('click', 'a.oe_mail_starbox', this.on_star);
         },
 
         on_message_reply:function(event){
@@ -617,24 +668,22 @@ openerp.mail = function(session) {
         },
 
         create_thread: function(){
-            var self=this;
             if(this.thread){
                 return false;
             }
-
             /*create thread*/
-            self.thread = new mail.Thread(self, self.datasets, {
-                    'domain': self.domain,
+            this.thread = new mail.Thread(this, this.datasets, {
+                    'domain': this.domain,
                     'context':{
-                        'default_model': self.datasets.model,
-                        'default_res_id': self.datasets.res_id,
-                        'default_parent_id': self.datasets.id
+                        'default_model': this.datasets.model,
+                        'default_res_id': this.datasets.res_id,
+                        'default_parent_id': this.datasets.id
                     },
-                    'options': self.options
+                    'options': this.options
                 }
             );
             /*insert thread in parent message*/
-            self.thread.insertAfter(self.$el);
+            this.thread.insertAfter(this.$el);
         },
         
         animated_destroy: function(options) {
@@ -727,17 +776,7 @@ openerp.mail = function(session) {
             return this.ds_message.call('vote_toggle', [[self.datasets.id]]).pipe(function(vote){
 
                 self.datasets.has_voted=vote;
-                if (!self.datasets.has_voted) {
-                    var votes=[];
-                    for(var i in self.datasets.vote_user_ids){
-                        if(self.datasets.vote_user_ids[i][0]!=self.session.uid)
-                            vote.push(self.datasets.vote_user_ids[i]);
-                    }
-                    self.datasets.vote_user_ids=votes;
-                }
-                else {
-                    self.datasets.vote_user_ids.push([self.session.uid, 'You']);
-                }
+                self.datasets.vote_nb += self.datasets.has_voted ? 1 : -1;
                 self.display_vote();
             });
             return false;
@@ -747,8 +786,8 @@ openerp.mail = function(session) {
         display_vote: function () {
             var self = this;
             var vote_element = session.web.qweb.render('mail.thread.message.vote', {'widget': self});
-            self.$(".placeholder-mail-vote:first").empty();
-            self.$(".placeholder-mail-vote:first").html(vote_element);
+            self.$(".oe_msg_vote:first").remove();
+            self.$(".oe_mail_vote_count:first").replaceWith(vote_element);
         },
 
         // Stared/unstared + Render star.
@@ -826,7 +865,7 @@ openerp.mail = function(session) {
                 'display_indented_thread': options.options.display_indented_thread || -1,
                 'show_reply_button': options.options.show_reply_button || -1,
                 'typeof_thread': options.options.typeof_thread || 'inbox',
-                'show_header_compose': options.options.show_header_compose || false,
+                'show_compose_message': options.options.show_compose_message || false,
                 '_parents': (options.options._parents != undefined ? options.options._parents : []).concat( [this] )
             });
 
@@ -844,7 +883,7 @@ openerp.mail = function(session) {
                 'partner_ids' : []
             };
 
-            this.datasets.show_composeform = this.options.show_header_compose && this.options.show_reply_button>this.datasets.thread_level;
+            this.datasets.show_composeform = this.options.show_compose_message && this.options.show_reply_button>this.datasets.thread_level;
 
             for(var i in datasets.partner_ids){
                 if(datasets.partner_ids[i][0]!=(datasets.author_id ? datasets.author_id[0] : -1)){
@@ -880,7 +919,7 @@ openerp.mail = function(session) {
                 // root view
                 this.ComposeMessage.prependTo(this.$el);
             }
-            this.ComposeMessage.$el.hide();
+            this.ComposeMessage.do_hide_compact();
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -1069,7 +1108,7 @@ openerp.mail = function(session) {
             var self=this;
 
             if(this.datasets.show_composeform){
-                this.ComposeMessage.$el.show();
+                this.ComposeMessage.do_show_compact();
             }
 
             this.$('.oe_wall_no_message').remove();
@@ -1203,12 +1242,17 @@ openerp.mail = function(session) {
                     'show_read_unread_button': this.options.show_read_unread_button || 1,
                     'truncate_limit': this.options.truncate_limit || 250,
                     'show_record_name': this.options.show_record_name || false,
+                    'show_compose_message': this.options.show_compose_message || false
                 },
             });
 
             this.thread.appendTo( this.$el );
             this.thread.no_message();
             this.thread.message_fetch();
+
+            if(this.options.show_compose_message){
+                this.thread.ComposeMessage.do_show_compact();
+            }
         },
 
         bind_events: function(){
@@ -1264,7 +1308,7 @@ openerp.mail = function(session) {
             var domain = this.options.domain.concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]);
 
             // TDE note: replace message_is_follower by a check in message_follower_ids, as message_is_follower is not used in views anymore
-            var show_header_compose = this.view.is_action_enabled('edit') ||
+            var show_compose_message = this.view.is_action_enabled('edit') ||
                 (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
 
             if(this.root){
@@ -1275,10 +1319,10 @@ openerp.mail = function(session) {
                 'domain' : domain,
                 'context' : this.options.context,
                 'typeof_thread': this.options.context['typeof_thread'] || 'other',
-                'display_indented_thread': false,
-                'show_reply_button': false,
+                'display_indented_thread': 0,
+                'show_reply_button': 1,
                 'show_read_unread_button': false,
-                'show_header_compose': show_header_compose
+                'show_compose_message': show_compose_message
                 }
             );
 
@@ -1375,7 +1419,7 @@ openerp.mail = function(session) {
                 'display_indented_thread': 2,
                 'show_reply_button': 2,
                 'show_read_unread_button': 3,
-                'show_header_compose': true
+                'show_compose_message': true
                 }
             );
             return this.root.appendTo( this.$('.oe_mail_wall_threads:first') );
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 651f0588868..db3fb5050c9 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -174,9 +174,9 @@
         -->
     <div t-name="mail.record_thread" class="oe_mail_record_wall">
         <!-- <h4>History and Comments</h4> -->
-        <ul class="oe_mail_wall_threads">
+        <div class="oe_mail_wall_threads">
             <!-- contains the document thread -->
-        </ul>
+        </div>
     </div>
 
     <t t-name="mail.thread">
@@ -190,9 +190,9 @@
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply" title="Reply" class="oe_reply oe_e">)</a>
+                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
+                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
+                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
                 </div>
             </div>
 
@@ -258,11 +258,12 @@
             <t t-if='widget.datasets.has_voted'>
                 You
             </t>
-            <t t-if='(widget.datasets.vote_user_ids.length-(widget.datasets.has_voted?1:0)) > 0'>
+            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
                 <t t-if='widget.datasets.has_voted'> and </t>
-                <t t-esc="widget.datasets.vote_user_ids.length"/> people
+                <t t-esc="widget.datasets.vote_nb"/> people
             </t>
-            <t t-if='widget.datasets.vote_user_ids.length > 0'>
+            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
+                <t t-raw="(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0))"/>
                 concur
             </t>
         </span>

From 9bcada763f0fc09a2a943bcae8bfd199d51f6226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 19 Oct 2012 13:40:39 +0200
Subject: [PATCH 018/106] [WIP] mail: css of right buttons

bzr revid: fva@openerp.com-20121019114039-x442lscvj2oggyja
---
 addons/mail/static/src/css/mail.css | 8 ++------
 addons/mail/static/src/xml/mail.xml | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9d317f714d7..be3df528510 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -38,13 +38,9 @@
     display: block;
     margin-left: 40px;
 }
-.openerp .oe_mail .oe_msg.oe_with_buttons .oe_msg_center{
-    margin-right: 32px;
-}
 .openerp .oe_mail .oe_msg .oe_msg_right{
-    position: absolute;
-    right:0; top:0; bottom: 0; width: 32px;
-    overflow: hidden;
+    float: right;
+    background: yellow;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
     height: 32px;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f8c4ce92d1c..f6e69bc0ac8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -185,7 +185,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">

From f1a444bfa8b52262d30976ad00832abbe0d88744 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 13:53:34 +0200
Subject: [PATCH 019/106] [FIX] mail: double box on compose

bzr revid: chm@openerp.com-20121019115334-t7vmenp4isw9k1qi
---
 addons/mail/static/src/js/mail.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 4d8fdf8941c..69aeba6b9e0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -292,7 +292,6 @@ openerp.mail = function(session) {
                 this.$render_expandable.on('focus', 'textarea', function () { self.stay_open = false; });
                 this.$render_expandable.on('mousedown', function () { self.stay_open = true; });
             }
-
         },
 
         on_compose_fullmail: function(){
@@ -334,6 +333,7 @@ openerp.mail = function(session) {
             this.datasets.attachment_ids=[];
             this.display_attachments();
 
+            this.stay_open = false;
             this.on_compose_expandable();
         },
 
@@ -357,7 +357,7 @@ openerp.mail = function(session) {
             }
 
             if(body.match(/\S+/)) {
-                session.web.blockUI();
+                //session.web.blockUI();
                 this.parent_thread.ds_thread.call('message_post_api', [
                         this.context.default_res_id, 
                         mail.ChatterUtils.get_text2html(body), 
@@ -370,7 +370,7 @@ openerp.mail = function(session) {
                     ]).then(function(records){
                         self.parent_thread.switch_new_message(records);
                         self.on_cancel();
-                        session.web.unblockUI();
+                        //session.web.unblockUI();
                     });
                 return true;
             }
@@ -392,6 +392,7 @@ openerp.mail = function(session) {
 
                 this.bind_events();
             }
+
             if(this.$render_expandable.is(':hidden')){
 
                 this.$render_expandable.show();
@@ -420,7 +421,9 @@ openerp.mail = function(session) {
         },
 
         do_show_compact: function() {
-            this.$render_compact.show();
+            if(!this.$render_expandable || this.$render_expandable.is(':hidden')){
+                this.$render_compact.show();
+            }
             this.datasets.show_compact = true;
         }
     });

From 35b6725f3f8b23d94bbe45c92ecfa669eea1f48d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 14:38:16 +0200
Subject: [PATCH 020/106] [FIX] mail: sort of expandable message

bzr revid: chm@openerp.com-20121019123816-dzortu46e3fofmxp
---
 addons/mail/mail_message.py       |  4 ++--
 addons/mail/static/src/js/mail.js | 33 ++++++++++++++++---------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 989b63afee5..153598e57e2 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -45,7 +45,7 @@ class mail_message(osv.Model):
     _inherit = ['ir.needaction_mixin']
     _order = 'id desc'
 
-    _message_read_limit = 10
+    _message_read_limit = 15
     _message_read_fields = ['id', 'parent_id', 'model', 'res_id', 'body', 'subject', 'date', 'to_read',
         'type', 'vote_user_ids', 'attachment_ids', 'author_id', 'partner_ids', 'record_name', 'favorite_user_ids']
     _message_record_name_length = 18
@@ -346,7 +346,7 @@ class mail_message(osv.Model):
         if message_loaded_ids:
             domain += [('id', 'not in', message_loaded_ids)]
         limit = limit or self._message_read_limit
-        limit = 200
+
         read_messages = {}
         message_list = []
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 69aeba6b9e0..bc59bd3c35b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -457,6 +457,7 @@ openerp.mail = function(session) {
                 'model' : datasets.model || false,
                 'parent_id' : datasets.parent_id || false,
                 'nb_messages' : datasets.nb_messages || 0,
+                'thread_level' : datasets.thread_level || 0,
                 'type' : 'expandable',
                 'max_limit' : datasets.max_limit || false,
                 'flag_used' : false,
@@ -933,13 +934,13 @@ openerp.mail = function(session) {
         */
         on_scroll: function(event){
             if(event)event.stopPropagation();
-            var message = this.messages[0];
+            var message = this.messages[this.messages.length-1];
             if(message && message.datasets.type=="expandable" && message.datasets.max_limit){
                 var pos = message.$el.position();
                 if(pos.top){
                     /* bottom of the screen */
                     var bottom = $(window).scrollTop()+$(window).height()+200;
-                    if(bottom - pos.top > 0){
+                    if(bottom > pos.top){
                         message.on_expandable();
                     }
                 }
@@ -1131,23 +1132,23 @@ openerp.mail = function(session) {
             // check older and newer message for insert
             var parent_newer = false;
             var parent_older = false;
-            for(var i in thread_messages){
-                if((thread_messages[i].datasets.id > message.datasets.id && message.datasets.id > 0) || 
-                    thread_messages[i].datasets.id < 0){
-                    if(!parent_newer || 
-                        thread_messages[i].datasets.id < 0 || 
-                        parent_newer.datasets.id >= thread_messages[i].datasets.id) {
-                        parent_newer = thread_messages[i];
-                    }
-                } else if((thread_messages[i].datasets.id > 0 && thread_messages[i].datasets.id < message.datasets.id) || message.datasets.id < 0) {
-                    if(!parent_older || 
-                        parent_older.datasets.id < thread_messages[i].datasets.id) {
-                        parent_older = thread_messages[i];
+            if(message.datasets.id > 0){
+                for(var i in thread_messages){
+                    if(thread_messages[i].datasets.id > message.datasets.id){
+                        if(!parent_newer || 
+                            parent_newer.datasets.id > thread_messages[i].datasets.id) {
+                            parent_newer = thread_messages[i];
+                        }
+                    } else if(thread_messages[i].datasets.id > 0 && thread_messages[i].datasets.id < message.datasets.id) {
+                        if(!parent_older || 
+                            parent_older.datasets.id < thread_messages[i].datasets.id) {
+                            parent_older = thread_messages[i];
+                        }
                     }
                 }
             }
 
-            var sort = self.datasets.thread_level;
+            var sort = (!!message.datasets.thread_level || message.datasets.id<0);
 
             if(parent_older){
                 if(sort){
@@ -1162,7 +1163,7 @@ openerp.mail = function(session) {
                     message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
                 }
             } else {
-                if(sort) {
+                if(sort && message.datasets.id>0) {
                     message.prependTo(thread.$el);
                 } else {
                     message.appendTo(thread.$el);

From 491034ed0af1e6784a122f9cbf15e44696f675c7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 15:13:58 +0200
Subject: [PATCH 021/106] [FIX] mail: to_read value of _message_get_dict

bzr revid: chm@openerp.com-20121019131358-xn3b8yyepscsrad7
---
 addons/mail/mail_message.py       |  7 +++----
 addons/mail/static/src/js/mail.js | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 153598e57e2..490f11b0e33 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -77,8 +77,7 @@ class mail_message(osv.Model):
         notif_obj = self.pool.get('mail.notification')
         notif_ids = notif_obj.search(cr, uid, [
             ('partner_id', 'in', [partner_id]),
-            ('message_id', 'in', ids),
-            ('read', '=', True)
+            ('message_id', 'in', ids)
         ], context=context)
         for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
             res[notif.message_id.id] = not notif.read
@@ -342,7 +341,6 @@ class mail_message(osv.Model):
                 further parents
             :return list: list of trees of messages
         """
-        print '>>> executing message_read'
         if message_loaded_ids:
             domain += [('id', 'not in', message_loaded_ids)]
         limit = limit or self._message_read_limit
@@ -375,8 +373,9 @@ class mail_message(osv.Model):
                             message_list.append(self._message_get_dict(cr, uid, parent, context=context))
                         parent = self._get_parent(cr, uid, parent, context=context)
 
-            # get the child expandable messages for the tree
             message_list = sorted(message_list, key=lambda k: k['id'])
+
+            # get the child expandable messages for the tree
             message_list = self._message_read_expandable(cr, uid, message_list, read_messages,
                 message_loaded_ids=message_loaded_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
 
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index bc59bd3c35b..8d5c1aabf87 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -934,6 +934,8 @@ openerp.mail = function(session) {
         */
         on_scroll: function(event){
             if(event)event.stopPropagation();
+            this.$('.oe_msg_expandable:last');
+
             var message = this.messages[this.messages.length-1];
             if(message && message.datasets.type=="expandable" && message.datasets.max_limit){
                 var pos = message.$el.position();
@@ -944,7 +946,6 @@ openerp.mail = function(session) {
                         message.on_expandable();
                     }
                 }
-
             }
         },
 
@@ -1099,15 +1100,22 @@ openerp.mail = function(session) {
                 });
             }
 
+            // insert the message on dom
+            self.insert_message( message );
+
             // check if the message is already create
             for(var i in self.messages){
                 if(self.messages[i].datasets.id == message.datasets.id){
                     self.messages[i].destroy();
-                    self.messages[i] = self.insert_message(message);
-                    return true;
+                    if(message.datasets.id>0){
+                        self.messages[i] = message;
+                        return true;
+                    } else {
+                        delete self.messages[i];
+                    }
                 }
             }
-            self.messages.push( self.insert_message(message) );
+            self.messages.push( message );
         },
 
         /** Displays a message or an expandable message  */

From aefa8b2337ee1fd060c91faa487cd3f6501d15d3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 15:16:22 +0200
Subject: [PATCH 022/106] [FIX] mail: full_message first open

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

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8d5c1aabf87..823f57a271d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -317,7 +317,7 @@ openerp.mail = function(session) {
                     'default_res_id': this.context.default_res_id,
                     'default_content_subtype': 'html',
                     'default_parent_id': this.datasets.id,
-                    'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable.find('textarea').val() || ''),
+                    'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
                     'default_attachment_ids': attachments,
                     'default_partner_ids': partner_ids
                 },

From 591c0ff3486e8c26a6b16e016e9db84fccd660ea Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 15:23:07 +0200
Subject: [PATCH 023/106] [FIX] mail_followers: display_subtypes read first
 time

bzr revid: chm@openerp.com-20121019132307-s7hvnjltjvc9kndo
---
 addons/mail/static/src/js/mail_followers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 735b3e00e0b..7deabf21846 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -188,7 +188,7 @@ openerp_mail_followers = function(session, mail) {
         display_subtypes:function (data) {
             var self = this;
             var subtype_list_ul = this.$('.oe_subtypes');
-            var records = data[this.view.dataset.ids[0]].message_subtype_data;
+            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;

From 63d5acfa6b1a1a910d173e980edc7b2b66eae212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 19 Oct 2012 15:32:05 +0200
Subject: [PATCH 024/106] [IMP] mail: buttons are at the right place

bzr revid: fva@openerp.com-20121019133205-06uavw1esxh5our5
---
 addons/mail/static/src/css/mail.css | 19 ++++++++++++++-----
 addons/mail/static/src/js/mail.js   | 16 ++++++++--------
 addons/mail/static/src/xml/mail.xml | 10 +++++-----
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index be3df528510..a3c3425f305 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -21,7 +21,11 @@
     border-radius: 2px;
     border: solid 1px #ececec;
     margin-bottom: 4px;
-    min-height: 75px;
+    min-height: 44px;
+}
+.openerp .oe_mail .oe_msg:not(.oe_lvl_0){
+    background: #eeecfc;
+    border: solid 1px #eee5ff;
 }
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
@@ -40,7 +44,7 @@
 }
 .openerp .oe_mail .oe_msg .oe_msg_right{
     float: right;
-    background: yellow;
+    height: 24px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
     height: 32px;
@@ -52,11 +56,16 @@
     overflow: hidden;
     padding: 4px;
 }
-.openerp .oe_mail .oe_msg .oe_msg_icons a{
-    text-decoration: none;
-    display: block;
+.openerp .oe_mail .oe_msg .oe_msg_right .oe_msg_icons span{
+    float:right;
+    width:24px;
+    height:24px;
+    line-height:24px;
     text-align: center;
 }
+.openerp .oe_mail .oe_msg .oe_msg_right .oe_msg_icons a{
+    text-decoration: none;
+}
 .openerp .oe_mail .oe_msg .oe_msg_content textarea{
     width: 100%;
     height: 100%;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 24946a6fd81..e49811ab38c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -886,7 +886,7 @@ openerp.mail = function(session) {
             }
 
             this.messages = [];
-            this.ComposeMessage = false;
+            this.composeMessage = false;
 
             this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model || 'mail.thread');
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
@@ -902,18 +902,18 @@ openerp.mail = function(session) {
 
         instantiate_ComposeMessage: function(){
             // add message composition form view
-            this.ComposeMessage = new mail.ThreadComposeMessage(this, this.datasets, {
+            this.composeMessage = new mail.ThreadComposeMessage(this, this.datasets, {
                 'context': this.context,
                 'options': this.options,
             });
 
             if(this.datasets.thread_level){
-                this.ComposeMessage.appendTo(this.$el);
+                this.composeMessage.appendTo(this.$el);
             } else {
                 // root view
-                this.ComposeMessage.prependTo(this.$el);
+                this.composeMessage.prependTo(this.$el);
             }
-            this.ComposeMessage.do_hide_compact();
+            this.composeMessage.do_hide_compact();
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -1030,7 +1030,7 @@ openerp.mail = function(session) {
         /* this function is launch when a user click on "Reply" button
         */
         on_compose_message: function(){
-            this.ComposeMessage.on_compose_expandable();
+            this.composeMessage.on_compose_expandable();
         },
 
         /* display the no message on the thread
@@ -1102,7 +1102,7 @@ openerp.mail = function(session) {
             var self=this;
 
             if(this.datasets.show_composeform){
-                this.ComposeMessage.do_show_compact();
+                this.composeMessage.do_show_compact();
             }
 
             this.$('.oe_wall_no_message').remove();
@@ -1412,7 +1412,7 @@ openerp.mail = function(session) {
 
         bind_events: function(){
             var self=this;
-            this.$("button.oe_write_full:first").click(function(){ self.root.thread.ComposeMessage.on_compose_fullmail(); });
+            this.$("button.oe_write_full:first").click(function(){ self.root.thread.composeMessage.on_compose_fullmail(); });
             this.$("button.oe_write_onwall:first").click(function(){ self.root.thread.on_compose_message(); });
         }
     });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f6e69bc0ac8..39cd5bbce38 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -185,14 +185,14 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_lvl_#{widget.datasets.thread_level} oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
+                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
+                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
+                    <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">)</a></span>
                 </div>
             </div>
 
@@ -279,6 +279,6 @@
         Template used to display stared/unstared message in a mail.message
     -->
     <t t-name="mail.thread.message.star">
-         <a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a>
+        <span><a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a></span>
     </t>
 </template>

From 8d31ef9c0ec4b2aa597addd33d56c15e92ae5bea Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 15:53:56 +0200
Subject: [PATCH 025/106] [IMP] mail: reduce options for js

bzr revid: chm@openerp.com-20121019135356-kxtg99zmxdyesbcr
---
 addons/mail/static/src/js/mail.js | 85 ++++++++++---------------------
 1 file changed, 28 insertions(+), 57 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 823f57a271d..419005b4b74 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -129,8 +129,7 @@ openerp.mail = function(session) {
                 'partner_ids': datasets.partner_ids || [],
                 'avatar': mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid),
             };
-            this.options={};
-            this.options.display_indented_thread = options.options.display_indented_thread || -1;
+            this.options = options.options;
             this.options.show_attachment_delete = true;
 
             this.parent_thread= parent.messages!= undefined ? parent : false;
@@ -539,9 +538,6 @@ openerp.mail = function(session) {
          * @param {Object} [options]
          *      @param {Object} [thread] read obout mail.Thread object
          *      @param {Object} [message]
-         *          @param {Number} [message_ids=null] ids for message_fetch
-         *          @param {Number} [message_data=null] already formatted message data, 
-         *              for subthreads getting data from their parent
          *          @param {Number} [truncate_limit=250] number of character to
          *              display before having a "show more" link; note that the text
          *              will not be truncated if it does not have 110% of the parameter
@@ -583,17 +579,10 @@ openerp.mail = function(session) {
                 default_parent_id: false }, options.context || {});
 
             // record options
-            this.options = _.extend(options.options, {
-                'message_ids': options.options.message_ids || null,
-                'message_data': options.options.message_data || null,
-                'show_record_name': options.options.show_record_name != undefined ? options.options.show_record_name: true,
-                'truncate_limit': options.options.truncate_limit || 250,
-                'show_reply_button': options.options.show_reply_button || -1,
-                'show_read_unread_button': options.options.show_read_unread_button || -1
-            });
+            this.options = options.options;
 
-            this.datasets.show_reply_button = this.options.show_reply_button>this.datasets.thread_level;
-            this.datasets.show_read_unread_button = this.options.show_read_unread_button>this.datasets.thread_level;
+            this.datasets.show_reply_button = this.options.show_compose_message && this.options.show_reply_button > this.datasets.thread_level;
+            this.datasets.show_read_unread_button = this.options.show_read_unread_button > this.datasets.thread_level;
 
             // record options and data
             this.parent_thread= parent.messages!= undefined ? parent : options.options._parents[0];
@@ -844,10 +833,6 @@ openerp.mail = function(session) {
          * @param {Object} [options]
          *      @param {Object} [message] read about mail.ThreadMessage object
          *      @param {Object} [thread]
-         *          @param {Number} [expandable_number=5] number message show
-         *              for each click on "show more message"
-         *          @param {Number} [expandable_default_number=5] number message show
-         *              on begin before the first click on "show more message"
          *          @param {int} [display_indented_thread] number thread level to indented threads.
          *              other are on flat mode
          *          @param {Select} [typeof_thread] inbox/archives/stared/sent
@@ -864,17 +849,8 @@ openerp.mail = function(session) {
                 default_res_id: 0,
                 default_parent_id: false }, options.context || {});
 
-            // options
-            this.options = _.extend(options.options, {
-                'expandable_number': options.options.expandable_number || 5,
-                'expandable_default_number': options.options.expandable_default_number || 5,
-                '_expandable_max': options.options.expandable_default_number || 5,
-                'display_indented_thread': options.options.display_indented_thread || -1,
-                'show_reply_button': options.options.show_reply_button || -1,
-                'typeof_thread': options.options.typeof_thread || 'inbox',
-                'show_compose_message': options.options.show_compose_message || false,
-                '_parents': (options.options._parents != undefined ? options.options._parents : []).concat( [this] )
-            });
+            this.options = options.options;
+            this.options._parents = (options.options._parents != undefined ? options.options._parents : []).concat( [this] );
 
             // record options and data
             this.parent_message= parent.thread!= undefined ? parent : false ;
@@ -890,7 +866,7 @@ openerp.mail = function(session) {
                 'partner_ids' : []
             };
 
-            this.datasets.show_composeform = this.options.show_compose_message && this.options.show_reply_button>this.datasets.thread_level;
+            this.datasets.show_compose_message = this.options.show_compose_message && this.options.show_reply_button>this.datasets.thread_level;
 
             for(var i in datasets.partner_ids){
                 if(datasets.partner_ids[i][0]!=(datasets.author_id ? datasets.author_id[0] : -1)){
@@ -907,7 +883,7 @@ openerp.mail = function(session) {
         
         start: function() {
             this._super.apply(this, arguments);
-            if(this.datasets.show_composeform){
+            if(this.datasets.show_compose_message){
                 this.instantiate_ComposeMessage();
             }
             this.bind_events();
@@ -1054,19 +1030,12 @@ openerp.mail = function(session) {
         },
 
         /** Fetch messages
-         * @param {Bool} initial_mode: initial mode: try to use message_data or
-         *  message_ids, if nothing available perform a message_read; otherwise
-         *  directly perform a message_read
          * @param {Array} replace_domain: added to this.domain
          * @param {Object} replace_context: added to this.context
          */
         message_fetch: function (initial_mode, replace_domain, replace_context, ids, callback) {
             var self = this;
 
-            // initial mode: try to use message_data or message_ids
-            if (initial_mode && this.options.message_data) {
-                return this.create_message_object(this.options.message_data);
-            }
             // domain and context: options + additional
             fetch_domain = replace_domain ? replace_domain : this.domain;
             fetch_context = replace_context ? replace_context : this.context;
@@ -1122,7 +1091,7 @@ openerp.mail = function(session) {
         insert_message: function (message) {
             var self=this;
 
-            if(this.datasets.show_composeform){
+            if(this.datasets.show_compose_message && this.options.display_indented_thread > self.datasets.thread_level){
                 this.ComposeMessage.do_show_compact();
             }
 
@@ -1232,9 +1201,17 @@ openerp.mail = function(session) {
         init: function (parent, options) {
             this._super(parent);
             this.options = options || {};
-            this.options.domain = options.domain || [];
-            this.options.context = options.context || {};
+            this.domain = options.domain || [];
+            this.context = options.context || {};
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}};
+
+            this.options.typeof_thread = this.options.typeof_thread || 'inbox',
+            this.options.display_indented_thread = this.options.display_indented_thread !== false ? this.options.display_indented_thread : -1,
+            this.options.show_reply_button = this.options.show_reply_button !== false ? this.options.show_reply_button : -1,
+            this.options.show_read_unread_button = this.options.show_read_unread_button !== false ? this.options.show_read_unread_button : -1,
+            this.options.truncate_limit = this.options.truncate_limit || 250,
+            this.options.show_record_name = this.options.show_record_name || false,
+            this.options.show_compose_message = this.options.show_compose_message || false
         },
 
         start: function (options) {
@@ -1247,18 +1224,11 @@ openerp.mail = function(session) {
          * Display the threads
           */
         message_render: function (search) {
+
             this.thread = new mail.Thread(this, {}, {
-                'domain' : this.options.domain,
-                'context' : this.options.context,
-                'options': {
-                    'typeof_thread': this.options.typeof_thread || 'inbox',
-                    'display_indented_thread': this.options.display_indented_thread || 1,
-                    'show_reply_button': this.options.show_reply_button || 1,
-                    'show_read_unread_button': this.options.show_read_unread_button || 1,
-                    'truncate_limit': this.options.truncate_limit || 250,
-                    'show_record_name': this.options.show_record_name || false,
-                    'show_compose_message': this.options.show_compose_message || false
-                },
+                'domain' : this.domain,
+                'context' : this.context,
+                'options': this.options,
             });
 
             this.thread.appendTo( this.$el );
@@ -1271,7 +1241,7 @@ openerp.mail = function(session) {
         },
 
         bind_events: function(){
-            if(this.options.context['typeof_thread']!='other'){
+            if(this.context['typeof_thread']!='other'){
                 $(document).scroll( this.thread.on_scroll );
                 $(window).resize( this.thread.on_scroll );
                 window.setTimeout( this.thread.on_scroll, 500 );
@@ -1334,9 +1304,9 @@ openerp.mail = function(session) {
                 'domain' : domain,
                 'context' : this.options.context,
                 'typeof_thread': this.options.context['typeof_thread'] || 'other',
-                'display_indented_thread': 0,
-                'show_reply_button': 1,
-                'show_read_unread_button': false,
+                'display_indented_thread': -1,
+                'show_reply_button': 10,
+                'show_read_unread_button': -1,
                 'show_compose_message': show_compose_message
                 }
             );
@@ -1437,6 +1407,7 @@ openerp.mail = function(session) {
                 'show_compose_message': true
                 }
             );
+
             return this.root.appendTo( this.$('.oe_mail_wall_threads:first') );
         },
 

From 1fbee6cb3cc28996729a9259d283906b23848ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 19 Oct 2012 16:04:39 +0200
Subject: [PATCH 026/106] [WIP] mail: tests: WIP about comments and tests about
 message_read. Will be continued later.

bzr revid: tde@openerp.com-20121019140439-u64d06em0z7eax0m
---
 addons/mail/mail_message.py    | 43 ++++++++++++++++++++--------------
 addons/mail/tests/test_mail.py | 19 +++++++++++++--
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 8719d59bf04..52878a34e10 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -240,7 +240,7 @@ class mail_message(osv.Model):
             'to_read': message['to_read'],
         }
 
-    def _message_read_expandable(self, cr, uid, message_list, read_messages,
+    def _message_read_add_expandables(self, cr, uid, message_list, read_messages,
             message_loaded_ids=[], domain=[], context=None, parent_id=False, limit=None):
         """ Create the expandable message for all parent message read
             this function is used by message_read
@@ -331,23 +331,30 @@ class mail_message(osv.Model):
         except (orm.except_orm, osv.except_osv):
             return False
 
-    def message_read(self, cr, uid, ids=False, domain=[], message_loaded_ids=[], context=None, parent_id=False, limit=None):
-        """ Read messages from mail.message, and get back a structured tree
-            of messages to be displayed as discussion threads. If IDs is set,
+    def message_read(self, cr, uid, ids=False, domain=[], message_unload_ids=[], context=None, parent_id=False, limit=None):
+        """ Read messages from mail.message, and get back a list of structured
+            messages to be displayed as discussion threads. If IDs is set,
             fetch these records. Otherwise use the domain to fetch messages.
-            After having fetch messages, their parents & child will be added to obtain
-            well formed threads.
+            After having fetch messages, their ancestors will be added to obtain
+            well formed threads, if uid has access to them.
 
-            TDE note: update this comment after final method implementation
+            After reading the messages, expandables messages are added in the
+            message list (see ``_message_read_add_expandables``). It consists
+            in messages holding the 'read more' data: number of messages to
+            read, domain to apply.
 
-            :param domain: optional domain for searching ids
-            :param limit: number of messages to fetch
-            :param parent_id: if parent_id reached, stop searching for
-                further parents
-            :return list: list of trees of messages
+            :param list ids: optional IDs to fetch
+            :param list domain: optional domain for searching ids if ids not set
+            :param list message_unload_ids: optional ids we do not want to fetch,
+                because i.e. they are already displayed somewhere
+            :param int parent_id: if parent_id reached when adding ancestors,
+                stop going further in the ancestor search
+            :param int limit: number of messages to fetch, before adding the
+                ancestors and expandables
+            :return list: list of message structure for the Chatter widget
         """
-        if message_loaded_ids:
-            domain += [('id', 'not in', message_loaded_ids)]
+        if message_unload_ids:
+            domain += [('id', 'not in', message_unload_ids)]
         limit = limit or self._message_read_limit
         read_messages = {}
         message_list = []
@@ -364,22 +371,22 @@ class mail_message(osv.Model):
         ids = self.search(cr, uid, domain, context=context, limit=limit)
         for message in self.read(cr, uid, ids, self._message_read_fields, context=context):
             # if not in tree and not in message_loded list
-            if not read_messages.get(message.get('id')) and message.get('id') not in message_loaded_ids:
+            if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
                 read_messages[message.get('id')] = message
                 message_list.append(self._message_get_dict(cr, uid, message, context=context))
 
                 # get all parented message if the user have the access
                 parent = self._get_parent(cr, uid, message, context=context)
                 while parent and parent.get('id') != parent_id:
-                    if not read_messages.get(parent.get('id')) and parent.get('id') not in message_loaded_ids:
+                    if not read_messages.get(parent.get('id')) and parent.get('id') not in message_unload_ids:
                         read_messages[parent.get('id')] = parent
                         message_list.append(self._message_get_dict(cr, uid, parent, context=context))
                     parent = self._get_parent(cr, uid, parent, context=context)
 
         # get the child expandable messages for the tree
         message_list = sorted(message_list, key=lambda k: k['id'])
-        message_list = self._message_read_expandable(cr, uid, message_list, read_messages,
-            message_loaded_ids=message_loaded_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
+        message_list = self._message_read_add_expandables(cr, uid, message_list, read_messages,
+            message_loaded_ids=message_unload_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
 
         # message_list = sorted(message_list, key=lambda k: k['id'])
         return message_list
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 2eff59fe0ed..016a392f9dc 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -522,7 +522,22 @@ class test_mail(TestMailMockups):
 
     def test_30_message_read(self):
         """ Tests for message_read and expandables. """
-        self.assertTrue(1 == 1, 'Test not implemented, do not replace by return True')
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+
+        # Data: create a discussion in Pigs
+        msg_ids = []
+        for dummy in range(5):
+            msg_ids.append(self.group_pigs.message_post(body='My Body', subtype='mt_comment'))
+
+        # Test: read some specific ids
+        read_msg_list = self.mail_message.message_read(cr, uid, ids=msg_ids[1:3], domain=[('body', 'like', 'dummy')])
+        read_msg_ids = [msg.get('id') for msg in read_msg_list]
+        self.assertEqual(msg_ids[1:3], read_msg_ids, 'message_read with direct ids should read only the requested ids')
+
+        # Test: read messages of Pigs through a domain
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=200)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list]
+        self.assertEqual(msg_ids, read_msg_ids, 'message_read with domain on Pigs should equal all messages of Pigs')
 
     def test_40_needaction(self):
         """ Tests for mail.message needaction. """
@@ -584,7 +599,7 @@ class test_mail(TestMailMockups):
         # TDE note: temp various asserts because of the random bug about msg1.child_ids
         msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=1)
         new_msg = self.mail_message.browse(cr, uid, msg_ids[0])
-        self.assertEqual(new_msg.parent_id, msg1, 'Newly processed mail_message (%d) should have msg1 as parent' % (new_msg.id))
+        self.assertEqual(new_msg.parent_id, msg1, 'Newly processed mail_message (%d) should have msg1 as parent (msg2 is %d)' % (new_msg.id, msg2.id))
 
         # 2. References header
         reply_msg2 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: Re: 1',

From 9daba198cd5b79c093ef8a14c9c3d7797e9108c5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 16:32:28 +0200
Subject: [PATCH 027/106] [IMP] mail: reduce code js

bzr revid: chm@openerp.com-20121019143228-rzc4k2s7pxa0glk9
---
 addons/mail/static/src/js/mail.js   | 61 +++++++++++++++++------------
 addons/mail/static/src/xml/mail.xml |  2 +-
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 419005b4b74..6adc357023e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -123,14 +123,12 @@ openerp.mail = function(session) {
                 'attachment_ids' : [],
                 'id': datasets.id,
                 'model': datasets.model,
-                'show_compact': true,
                 'res_model': datasets.res_model,
                 'is_private': datasets.is_private || false,
                 'partner_ids': datasets.partner_ids || [],
                 'avatar': mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid),
             };
             this.options = options.options;
-            this.options.show_attachment_delete = true;
 
             this.parent_thread= parent.messages!= undefined ? parent : false;
 
@@ -146,7 +144,7 @@ openerp.mail = function(session) {
         start: function(){
             this.$render_compact = this.$el;
 
-            if(this.datasets.show_compact) {
+            if(this.options.show_compact_message) {
                 this.$render_compact.show();
             } else {
                 this.$render_compact.hide();
@@ -403,7 +401,7 @@ openerp.mail = function(session) {
                 // do not close the box if there are some text
                 if(!this.$render_expandable.find('textarea').val().match(/\S+/)){
                     this.$render_expandable.hide();
-                    if(this.datasets.show_compact) {
+                    if(this.options.show_compact_message) {
                         this.$render_compact.show();
                     } else {
                         this.$render_compact.hide();
@@ -416,14 +414,14 @@ openerp.mail = function(session) {
 
         do_hide_compact: function() {
             this.$render_compact.hide();
-            this.datasets.show_compact = false;
+            this.options.show_compact_message = false;
         },
 
         do_show_compact: function() {
             if(!this.$render_expandable || this.$render_expandable.is(':hidden')){
                 this.$render_compact.show();
             }
-            this.datasets.show_compact = true;
+            this.options.show_compact_message = true;
         }
     });
 
@@ -863,17 +861,11 @@ openerp.mail = function(session) {
                 'is_private' : datasets.is_private || false,
                 'author_id' : datasets.author_id || false,
                 'thread_level' : (datasets.thread_level+1) || 0,
-                'partner_ids' : []
+                'partner_ids' : _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } ) 
             };
 
             this.datasets.show_compose_message = this.options.show_compose_message && this.options.show_reply_button>this.datasets.thread_level;
 
-            for(var i in datasets.partner_ids){
-                if(datasets.partner_ids[i][0]!=(datasets.author_id ? datasets.author_id[0] : -1)){
-                    this.datasets.partner_ids.push(datasets.partner_ids[i]);
-                }
-            }
-
             this.messages = [];
             this.ComposeMessage = false;
 
@@ -1020,6 +1012,11 @@ openerp.mail = function(session) {
         /* this function is launch when a user click on "Reply" button
         */
         on_compose_message: function(){
+            if(!this.ComposeMessage){
+                this.instantiate_ComposeMessage();
+                this.ComposeMessage.do_hide_compact();
+            }
+
             this.ComposeMessage.on_compose_expandable();
         },
 
@@ -1091,7 +1088,7 @@ openerp.mail = function(session) {
         insert_message: function (message) {
             var self=this;
 
-            if(this.datasets.show_compose_message && this.options.display_indented_thread > self.datasets.thread_level){
+            if(this.datasets.show_compose_message && this.options.display_indented_thread > self.datasets.thread_level && this.options.show_compact_message){
                 this.ComposeMessage.do_show_compact();
             }
 
@@ -1197,21 +1194,37 @@ openerp.mail = function(session) {
          *...  @param {int} [show_read_unread_button] number thread level to display the read/unread button
          *...  @param {int} [display_indented_thread] number thread level to indented threads.
          *      other are on flat mode
+         *...  @param {Boolean} [show_compose_message] allow to display the composer
+         *...  @param {Boolean} [show_compact_message] display the compact message on the thread
+         *      when the user clic on this compact mode, the composer is open
          */
         init: function (parent, options) {
             this._super(parent);
-            this.options = options || {};
             this.domain = options.domain || [];
             this.context = options.context || {};
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}};
 
-            this.options.typeof_thread = this.options.typeof_thread || 'inbox',
-            this.options.display_indented_thread = this.options.display_indented_thread !== false ? this.options.display_indented_thread : -1,
-            this.options.show_reply_button = this.options.show_reply_button !== false ? this.options.show_reply_button : -1,
-            this.options.show_read_unread_button = this.options.show_read_unread_button !== false ? this.options.show_read_unread_button : -1,
-            this.options.truncate_limit = this.options.truncate_limit || 250,
-            this.options.show_record_name = this.options.show_record_name || false,
-            this.options.show_compose_message = this.options.show_compose_message || false
+            this.options = _.extend({
+                'typeof_thread' : 'inbox',
+                'display_indented_thread' : -1,
+                'show_reply_button' : -1,
+                'show_read_unread_button' : -1,
+                'truncate_limit' : 250,
+                'show_record_name' : false,
+                'show_compose_message' : false,
+                'show_compact_message' : false 
+            }, options);
+
+            if(this.display_indented_thread === false) {
+                this.display_indented_thread = -1;
+            }
+            if(this.show_reply_button === false) {
+                this.show_reply_button = -1;
+            }
+            if(this.show_read_unread_button === false) {
+                this.show_read_unread_button = -1;
+            }
+            
         },
 
         start: function (options) {
@@ -1402,8 +1415,8 @@ openerp.mail = function(session) {
                 'context' : context,
                 'typeof_thread': context['typeof_thread'] || 'other',
                 'display_indented_thread': 2,
-                'show_reply_button': 2,
-                'show_read_unread_button': 3,
+                'show_reply_button': 10,
+                'show_read_unread_button': 11,
                 'show_compose_message': true
                 }
             );
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index db3fb5050c9..54dbc4f9ded 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -82,7 +82,7 @@
                     <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
-                    <t t-if="widget.options.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
+                    <t t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)">
                         <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
                     </t>
 

From 7c842393f8b6c9687a378102e33005fef04bae9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 19 Oct 2012 18:03:11 +0200
Subject: [PATCH 028/106] [IMP] mail: a more minimalist design

bzr revid: fva@openerp.com-20121019160311-ssqosr9wdkmcmeaw
---
 addons/mail/static/src/css/mail.css | 30 +++++++++++++++++++++--------
 addons/mail/static/src/xml/mail.xml |  4 +++-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index a3c3425f305..cdbc9701703 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -3,7 +3,7 @@
 }
 .openerp .oe_mail {
     position: relative;
-    width: 560px;
+    width: 740px;
     margin: 16px;
 }
 .openerp .oe_mail .oe_thread{
@@ -17,15 +17,15 @@
 
 .openerp .oe_mail .oe_msg{
     position: relative;
-    background: #f7f7f7;
+    background: #F4F5FA;
     border-radius: 2px;
-    border: solid 1px #ececec;
-    margin-bottom: 4px;
-    min-height: 44px;
+    margin-bottom: 2px;
+    min-height: 40px;
 }
 .openerp .oe_mail .oe_msg:not(.oe_lvl_0){
-    background: #eeecfc;
-    border: solid 1px #eee5ff;
+    background: #FFF;
+    border: none;
+    margin-bottom:0px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
@@ -47,14 +47,22 @@
     height: 24px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
-    height: 32px;
+    height: 16px;
     padding-left: 4px;
     overflow: hidden;
+    font-size: 11px;
+    opacity:0;
+    -webkit-transition: opacity 0.2s linear;
+}
+.openerp .oe_mail .oe_thread:hover .oe_msg_footer{
+    opacity: 0.8;
+    -webkit-transition: opacity 0.2s linear;
 }
 .openerp .oe_mail .oe_msg .oe_msg_content{
     display: block;
     overflow: hidden;
     padding: 4px;
+    padding-bottom:1px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_right .oe_msg_icons span{
     float:right;
@@ -62,6 +70,12 @@
     height:24px;
     line-height:24px;
     text-align: center;
+    opacity: 0.2;
+    -webkit-transition: opacity 0.2s linear;
+}
+.openerp .oe_mail .oe_msg:hover .oe_msg_right .oe_msg_icons span{
+    opacity: 1;
+    -webkit-transition: opacity 0.1s linear;
 }
 .openerp .oe_mail .oe_msg .oe_msg_right .oe_msg_icons a{
     text-decoration: none;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 39cd5bbce38..50247fd6164 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -219,7 +219,7 @@
                     </t>
                 </div>
                 <div class="oe_msg_footer">
-                    <a t-if="widget.datasets.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}"><t t-raw="widget.datasets.author_id[1]"/></a>
+                    from <a t-if="widget.datasets.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}"><t t-raw="widget.datasets.author_id[1]"/></a>
                     <span t-att-title="widget.datasets.date"><t t-raw="widget.datasets.timerelative"/></span>
                         <a t-if="widget.datasets.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
                             <t t-if="widget.datasets.attachment_ids.length == 1">1 Attachment</t>
@@ -254,6 +254,7 @@
         Template used to display Like/Unlike in a mail.message
     -->
     <span t-name="mail.thread.message.vote">
+        <!--
         <span class="oe_left oe_mail_vote_count">
             <t t-if='widget.datasets.has_voted'>
                 You
@@ -273,6 +274,7 @@
                 <t t-if="widget.datasets.has_voted">Respectfully disagree</t>
             </span>
         </button>
+        -->
     </span>
 
     <!-- mail.thread.message.star

From e81ee26f64530ccba748d8d0dd975d1db3fde350 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 09:50:58 +0200
Subject: [PATCH 029/106] [FIX] mail: openchatter, sort for expandable message

bzr revid: chm@openerp.com-20121022075058-5sm5hs6lr8tvw2pg
---
 addons/mail/static/src/js/mail.js | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6adc357023e..46db23fc99a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -144,12 +144,6 @@ openerp.mail = function(session) {
         start: function(){
             this.$render_compact = this.$el;
 
-            if(this.options.show_compact_message) {
-                this.$render_compact.show();
-            } else {
-                this.$render_compact.hide();
-            }
-
             this.bind_events();
         },
 
@@ -687,6 +681,7 @@ openerp.mail = function(session) {
                 self.$el.fadeOut(options.fadeTime, function(){
                     self.destroy();
                 });
+                self.thread.$el.fadeOut(options.fadeTime);
             } else {
                 self.destroy();
             }
@@ -700,7 +695,6 @@ openerp.mail = function(session) {
             // delete this message and his childs
             var ids = [this.datasets.id].concat( this.get_child_ids() );
             this.ds_message.unlink(ids);
-            this.animated_destroy();
             return false;
         },
 
@@ -864,7 +858,7 @@ openerp.mail = function(session) {
                 'partner_ids' : _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } ) 
             };
 
-            this.datasets.show_compose_message = this.options.show_compose_message && this.options.show_reply_button>this.datasets.thread_level;
+            this.datasets.show_compose_message = this.options.show_compose_message && this.options.show_reply_button > this.datasets.thread_level;
 
             this.messages = [];
             this.ComposeMessage = false;
@@ -1088,7 +1082,8 @@ openerp.mail = function(session) {
         insert_message: function (message) {
             var self=this;
 
-            if(this.datasets.show_compose_message && this.options.display_indented_thread > self.datasets.thread_level && this.options.show_compact_message){
+            if(this.datasets.show_compose_message && 
+                this.options.display_indented_thread > self.datasets.thread_level){
                 this.ComposeMessage.do_show_compact();
             }
 
@@ -1103,7 +1098,7 @@ openerp.mail = function(session) {
                 _(thread.get_childs()).each(function (val, key) { thread_messages.push(val.parent_message); });
             }
 
-            // check older and newer message for insert
+            // check older and newer message for insertion
             var parent_newer = false;
             var parent_older = false;
             if(message.datasets.id > 0){
@@ -1122,7 +1117,7 @@ openerp.mail = function(session) {
                 }
             }
 
-            var sort = (!!message.datasets.thread_level || message.datasets.id<0);
+            var sort = (!!self.datasets.thread_level || message.datasets.id<0);
 
             if(parent_older){
                 if(sort){
@@ -1417,7 +1412,8 @@ openerp.mail = function(session) {
                 'display_indented_thread': 2,
                 'show_reply_button': 10,
                 'show_read_unread_button': 11,
-                'show_compose_message': true
+                'show_compose_message': true,
+                'show_compact_message': true
                 }
             );
 

From 5bd53c249791473013bbcd53d03dd30f3736ac73 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 10:10:48 +0200
Subject: [PATCH 030/106] [IMP] mail.js: delete datasets

bzr revid: chm@openerp.com-20121022081048-5ohjli1c3io3iv1b
---
 addons/mail/static/src/js/mail.js   | 247 ++++++++++++++--------------
 addons/mail/static/src/xml/mail.xml |  72 ++++----
 2 files changed, 155 insertions(+), 164 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e90ee5fc6e4..042a8cecf6a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -118,18 +118,16 @@ openerp.mail = function(session) {
             var self = this;
             this._super(parent);
             this.context = options.context || {};
-
-            this.datasets = {
-                'attachment_ids' : [],
-                'id': datasets.id,
-                'model': datasets.model,
-                'res_model': datasets.res_model,
-                'is_private': datasets.is_private || false,
-                'partner_ids': datasets.partner_ids || [],
-                'avatar': mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid),
-            };
             this.options = options.options;
 
+            // data of this compose message
+            this.attachment_ids = [];
+            this.id = datasets.id;
+            this.model = datasets.model;
+            this.res_model = datasets.res_model;
+            this.is_private = datasets.is_private || false;
+            this.partner_ids = datasets.partner_ids || [];
+            this.avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             this.parent_thread= parent.messages!= undefined ? parent : false;
 
             this.ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
@@ -175,24 +173,24 @@ openerp.mail = function(session) {
 
                 // if the files exits for this answer, delete the file before upload
                 var attachments=[];
-                for(var i in this.datasets.attachment_ids){
-                    if((this.datasets.attachment_ids[i].filename || this.datasets.attachment_ids[i].name) == filename){
-                        if(this.datasets.attachment_ids[i].upload){
+                for(var i in this.attachment_ids){
+                    if((this.attachment_ids[i].filename || this.attachment_ids[i].name) == filename){
+                        if(this.attachment_ids[i].upload){
                             return false;
                         }
-                        this.ds_attachment.unlink([this.datasets.attachment_ids[i].id]);
+                        this.ds_attachment.unlink([this.attachment_ids[i].id]);
                     } else {
-                        attachments.push(this.datasets.attachment_ids[i]);
+                        attachments.push(this.attachment_ids[i]);
                     }
                 }
-                this.datasets.attachment_ids = attachments;
+                this.attachment_ids = attachments;
 
                 // submit file
                 this.$render_expandable.find('form.oe_form_binary_form').submit();
 
                 this.$render_expandable.find(".oe_attachment_file").hide();
 
-                this.datasets.attachment_ids.push({
+                this.attachment_ids.push({
                     'id': 0,
                     'name': filename,
                     'filename': filename,
@@ -206,9 +204,9 @@ openerp.mail = function(session) {
         /* when the file is uploaded 
         */
         on_attachment_loaded: function (event, result) {
-            for(var i in this.datasets.attachment_ids){
-                if(this.datasets.attachment_ids[i].filename == result.filename && this.datasets.attachment_ids[i].upload) {
-                    this.datasets.attachment_ids[i]={
+            for(var i in this.attachment_ids){
+                if(this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload) {
+                    this.attachment_ids[i]={
                         'id': result.id,
                         'name': result.name,
                         'filename': result.filename,
@@ -230,15 +228,15 @@ openerp.mail = function(session) {
             var attachment_id=$(event.target).data("id");
             if (attachment_id) {
                 var attachments=[];
-                for(var i in this.datasets.attachment_ids){
-                    if(attachment_id!=this.datasets.attachment_ids[i].id){
-                        attachments.push(this.datasets.attachment_ids[i]);
+                for(var i in this.attachment_ids){
+                    if(attachment_id!=this.attachment_ids[i].id){
+                        attachments.push(this.attachment_ids[i]);
                     }
                     else {
                         this.ds_attachment.unlink([attachment_id]);
                     }
                 }
-                this.datasets.attachment_ids = attachments;
+                this.attachment_ids = attachments;
                 this.display_attachments();
             }
         },
@@ -287,16 +285,16 @@ openerp.mail = function(session) {
 
         on_compose_fullmail: function(){
             var attachments=[];
-            for(var i in this.datasets.attachment_ids){
-                attachments.push(this.datasets.attachment_ids[i].id);
+            for(var i in this.attachment_ids){
+                attachments.push(this.attachment_ids[i].id);
             }
             /* TDE note: I think this is not necessary, because
              * 1/ post on a document: followers added server-side in _notify
              * 2/ reply to a message: mail.compose.message should add the previous partners
              */
             var partner_ids=[];
-            for(var i in this.datasets.partner_ids){
-                partner_ids.push(this.datasets.partner_ids[i][0]);
+            for(var i in this.partner_ids){
+                partner_ids.push(this.partner_ids[i][0]);
             }
             var action = {
                 type: 'ir.actions.act_window',
@@ -310,7 +308,7 @@ openerp.mail = function(session) {
                     'default_model': this.context.default_model,
                     'default_res_id': this.context.default_res_id,
                     'default_content_subtype': 'html',
-                    'default_parent_id': this.datasets.id,
+                    'default_parent_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
                     'default_attachment_ids': attachments,
                     'default_partner_ids': partner_ids
@@ -324,7 +322,7 @@ openerp.mail = function(session) {
             this.$render_expandable.find('textarea').val("");
             this.$render_expandable.find('input[data-id]').remove();
 
-            this.datasets.attachment_ids=[];
+            this.attachment_ids=[];
             this.display_attachments();
 
             this.stay_open = false;
@@ -342,12 +340,12 @@ openerp.mail = function(session) {
             }
 
             var attachments=[];
-            for(var i in this.datasets.attachment_ids){
-                if(this.datasets.attachment_ids[i].upload){
+            for(var i in this.attachment_ids){
+                if(this.attachment_ids[i].upload){
                     session.web.dialog($('<div>' + session.web.qweb.render('CrashManager.warning', {message: 'Please, wait while the file is uploading.'}) + '</div>'));
                     return false;
                 }
-                attachments.push(this.datasets.attachment_ids[i].id);
+                attachments.push(this.attachment_ids[i].id);
             }
 
             if(body.match(/\S+/)) {
@@ -446,18 +444,15 @@ openerp.mail = function(session) {
                 default_res_id: 0,
                 default_parent_id: false }, options.context || {});
 
-            this.datasets = {
-                'id' : datasets.id || -1,
-                'model' : datasets.model || false,
-                'parent_id' : datasets.parent_id || false,
-                'nb_messages' : datasets.nb_messages || 0,
-                'thread_level' : datasets.thread_level || 0,
-                'type' : 'expandable',
-                'max_limit' : datasets.max_limit || false,
-                'flag_used' : false,
-            };
-
-            // record options and data
+            // data of this expandable message
+            this.id = datasets.id || -1,
+            this.model = datasets.model || false,
+            this.parent_id = datasets.parent_id || false,
+            this.nb_messages = datasets.nb_messages || 0,
+            this.thread_level = datasets.thread_level || 0,
+            this.type = 'expandable',
+            this.max_limit = datasets.max_limit || false,
+            this.flag_used = false,
             this.parent_thread= parent.messages!= undefined ? parent : options.options._parents[0] ;
         },
 
@@ -492,10 +487,10 @@ openerp.mail = function(session) {
         */
         on_expandable: function (event) {
             if(event)event.stopPropagation();
-            if(this.datasets.flag_used) {
+            if(this.flag_used) {
                 return false
             }
-            this.datasets.flag_used = true;
+            this.flag_used = true;
 
             this.animated_destroy({'fadeTime':300});
             this.parent_thread.message_fetch(false, this.domain, this.context);
@@ -543,28 +538,26 @@ openerp.mail = function(session) {
         init: function(parent, datasets, options) {
             this._super(parent);
 
-            // record datasets
-            this.datasets = _.extend({
-                'id' : -1,
-                'model' : false,
-                'parent_id': false,
-                'res_id' : false,
-                'type' : false,
-                'is_author' : false,
-                'is_private' : false,
-                'subject' : false,
-                'name' : false,
-                'record_name' : false,
-                'body' : false,
-                'vote_nb' :0,
-                'has_voted' : false,
-                'is_favorite' : false,
-                'thread_level' : 0,
-                'to_read' : true,
-                'author_id' : [],
-                'attachment_ids' : [],
-            }, datasets || {});
-            this.datasets._date = datasets.date;
+            // data of this message
+            this.id = datasets.id ||  -1,
+            this.model = datasets.model ||  false,
+            this.parent_id = datasets.parent_id ||  false,
+            this.res_id = datasets.res_id ||  false,
+            this.type = datasets.type ||  false,
+            this.is_author = datasets.is_author ||  false,
+            this.is_private = datasets.is_private ||  false,
+            this.subject = datasets.subject ||  false,
+            this.name = datasets.name ||  false,
+            this.record_name = datasets.record_name ||  false,
+            this.body = datasets.body ||  false,
+            this.vote_nb = datasets.vote_nb || 0,
+            this.has_voted = datasets.has_voted ||  false,
+            this.is_favorite = datasets.is_favorite ||  false,
+            this.thread_level = datasets.thread_level ||  0,
+            this.to_read = datasets.to_read ||  true,
+            this.author_id = datasets.author_id ||  [],
+            this.attachment_ids = datasets.attachment_ids ||  [],
+            this._date = datasets.date;
 
             // record domain and context
             this.domain = options.domain || [];
@@ -576,14 +569,14 @@ openerp.mail = function(session) {
             // record options
             this.options = options.options;
 
-            this.datasets.show_reply_button = this.options.show_compose_message && this.options.show_reply_button > this.datasets.thread_level;
-            this.datasets.show_read_unread_button = this.options.show_read_unread_button > this.datasets.thread_level;
+            this.show_reply_button = this.options.show_compose_message && this.options.show_reply_button > this.thread_level;
+            this.show_read_unread_button = this.options.show_read_unread_button > this.thread_level;
 
             // record options and data
             this.parent_thread= parent.messages!= undefined ? parent : options.options._parents[0];
             this.thread = false;
 
-            if( this.datasets.id > 0 ) {
+            if( this.id > 0 ) {
                 this.formating_data();
             }
 
@@ -595,15 +588,15 @@ openerp.mail = function(session) {
         formating_data: function(){
 
             //formating and add some fields for render
-            this.datasets.date = session.web.format_value(this.datasets._date, {type:"datetime"});
-            this.datasets.timerelative = $.timeago(this.datasets.date);
-            if (this.datasets.type == 'email') {
-                this.datasets.avatar = ('/mail/static/src/img/email_icon.png');
+            this.date = session.web.format_value(this._date, {type:"datetime"});
+            this.timerelative = $.timeago(this.date);
+            if (this.type == 'email') {
+                this.avatar = ('/mail/static/src/img/email_icon.png');
             } else {
-                this.datasets.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', this.datasets.author_id[0]);
+                this.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', this.author_id[0]);
             }
-            for (var l in this.datasets.attachment_ids) {
-                var attach = this.datasets.attachment_ids[l];
+            for (var l in this.attachment_ids) {
+                var attach = this.attachment_ids[l];
                 attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
             }
         },
@@ -663,12 +656,12 @@ openerp.mail = function(session) {
                 return false;
             }
             /*create thread*/
-            this.thread = new mail.Thread(this, this.datasets, {
+            this.thread = new mail.Thread(this, this, {
                     'domain': this.domain,
                     'context':{
-                        'default_model': this.datasets.model,
-                        'default_res_id': this.datasets.res_id,
-                        'default_parent_id': this.datasets.id
+                        'default_model': this.model,
+                        'default_res_id': this.res_id,
+                        'default_parent_id': this.id
                     },
                     'options': this.options
                 }
@@ -696,7 +689,7 @@ openerp.mail = function(session) {
             
             this.animated_destroy({fadeTime:250});
             // delete this message and his childs
-            var ids = [this.datasets.id].concat( this.get_child_ids() );
+            var ids = [this.id].concat( this.get_child_ids() );
             this.ds_message.unlink(ids);
             return false;
         },
@@ -709,7 +702,7 @@ openerp.mail = function(session) {
             // and send its opposite to set_message_read
             event.stopPropagation();
             // if this message is read, all childs message display is read
-            var ids = [this.datasets.id].concat( this.get_child_ids() );
+            var ids = [this.id].concat( this.get_child_ids() );
             var read = $(event.srcElement).hasClass("oe_read");
             this.$el.removeClass(read ? 'oe_msg_unread':'oe_msg_read').addClass(read ? 'oe_msg_read':'oe_msg_unread');
 
@@ -739,7 +732,7 @@ openerp.mail = function(session) {
                 }
             }
 
-            if(this.datasets.id==options.id)
+            if(this.id==options.id)
                 return this;
 
             for(var i in this.thread.messages){
@@ -756,7 +749,7 @@ openerp.mail = function(session) {
         */
         get_child_ids: function(){
             var res=[]
-            if(arguments[0]) res.push(this.datasets.id);
+            if(arguments[0]) res.push(this.id);
             if(this.thread){
                 res = res.concat( this.thread.get_child_ids(true) );
             }
@@ -766,10 +759,10 @@ openerp.mail = function(session) {
         on_vote: function (event) {
             event.stopPropagation();
             var self=this;
-            return this.ds_message.call('vote_toggle', [[self.datasets.id]]).pipe(function(vote){
+            return this.ds_message.call('vote_toggle', [[self.id]]).pipe(function(vote){
                 // TDE note: to update, because vote_user_ids is about to disappear to be replaced by vote_nb (number of votes)
-                self.datasets.has_voted=vote;
-                self.datasets.vote_nb += self.datasets.has_voted ? 1 : -1;
+                self.has_voted=vote;
+                self.vote_nb += self.has_voted ? 1 : -1;
                 self.display_vote();
             });
             return false;
@@ -788,9 +781,9 @@ openerp.mail = function(session) {
             event.stopPropagation();
             var self=this;
             var button = self.$('button.oe_mail_starbox:first');
-            return this.ds_message.call('favorite_toggle', [[self.datasets.id]]).pipe(function(star){
-                self.datasets.is_favorite=star;
-                if(self.datasets.is_favorite){
+            return this.ds_message.call('favorite_toggle', [[self.id]]).pipe(function(star){
+                self.is_favorite=star;
+                if(self.is_favorite){
                     button.addClass('oe_stared');
                 } else {
                     button.removeClass('oe_stared');
@@ -852,20 +845,18 @@ openerp.mail = function(session) {
             // record options and data
             this.parent_message= parent.thread!= undefined ? parent : false ;
 
-            // datasets and internal vars
-            this.datasets = {
-                'id' : datasets.id || false,
-                'model' : datasets.model || false,
-                'parent_id' : datasets.parent_id || false,
-                'is_private' : datasets.is_private || false,
-                'author_id' : datasets.author_id || false,
-                'thread_level' : (datasets.thread_level+1) || 0,
-                'partner_ids' : _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } ) 
-            };
-
-            this.datasets.show_compose_message = this.options.show_compose_message && this.options.show_reply_button > this.datasets.thread_level;
-
+            // data of this thread
+            this.id =  datasets.id || false,
+            this.model =  datasets.model || false,
+            this.parent_id =  datasets.parent_id || false,
+            this.is_private =  datasets.is_private || false,
+            this.author_id =  datasets.author_id || false,
+            this.thread_level =  (datasets.thread_level+1) || 0,
+            this.partner_ids =  _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } ) 
             this.messages = [];
+            this.show_compose_message = this.options.show_compose_message && this.options.show_reply_button > this.thread_level;
+
+            // object compose message
             this.ComposeMessage = false;
 
             this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model || 'mail.thread');
@@ -874,7 +865,7 @@ openerp.mail = function(session) {
         
         start: function() {
             this._super.apply(this, arguments);
-            if(this.datasets.show_compose_message){
+            if(this.show_compose_message){
                 this.instantiate_ComposeMessage();
             }
             this.bind_events();
@@ -882,12 +873,12 @@ openerp.mail = function(session) {
 
         instantiate_ComposeMessage: function(){
             // add message composition form view
-            this.ComposeMessage = new mail.ThreadComposeMessage(this, this.datasets, {
+            this.ComposeMessage = new mail.ThreadComposeMessage(this, this, {
                 'context': this.context,
                 'options': this.options,
             });
 
-            if(this.datasets.thread_level){
+            if(this.thread_level){
                 this.ComposeMessage.appendTo(this.$el);
             } else {
                 // root view
@@ -904,7 +895,7 @@ openerp.mail = function(session) {
             this.$('.oe_msg_expandable:last');
 
             var message = this.messages[this.messages.length-1];
-            if(message && message.datasets.type=="expandable" && message.datasets.max_limit){
+            if(message && message.type=="expandable" && message.max_limit){
                 var pos = message.$el.position();
                 if(pos.top){
                     /* bottom of the screen */
@@ -941,7 +932,7 @@ openerp.mail = function(session) {
         */
         get_child_ids: function(){
             var res=[];
-            _(this.get_childs()).each(function (val, key) { res.push(val.datasets.id); });
+            _(this.get_childs()).each(function (val, key) { res.push(val.id); });
             return res;
         },
 
@@ -976,7 +967,7 @@ openerp.mail = function(session) {
                 return this.options._parents[0].browse_thread(options);
             }
 
-            if(this.datasets.id==options.id){
+            if(this.id==options.id){
                 return this;
             }
 
@@ -1035,7 +1026,7 @@ openerp.mail = function(session) {
             // domain and context: options + additional
             fetch_domain = replace_domain ? replace_domain : this.domain;
             fetch_context = replace_context ? replace_context : this.context;
-            var message_loaded = [this.datasets.id||0].concat( self.options._parents[0].get_child_ids() );
+            var message_loaded = [this.id||0].concat( self.options._parents[0].get_child_ids() );
 
             return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded, fetch_context, this.context.default_parent_id || undefined]
                 ).then(this.proxy('switch_new_message'));
@@ -1052,10 +1043,10 @@ openerp.mail = function(session) {
                     'context': {
                         'default_model': data.model || self.context.default_model,
                         'default_res_id': data.res_id || self.context.default_res_id,
-                        'default_parent_id': self.datasets.id },
+                        'default_parent_id': self.id },
                 });
             } else {
-                var message = new mail.ThreadMessage(self, _.extend(data, {'thread_level': self.datasets.thread_level}), {
+                var message = new mail.ThreadMessage(self, _.extend(data, {'thread_level': self.thread_level}), {
                     'domain': data.domain,
                     'context': {
                         'default_model': data.model,
@@ -1070,9 +1061,9 @@ openerp.mail = function(session) {
 
             // check if the message is already create
             for(var i in self.messages){
-                if(self.messages[i].datasets.id == message.datasets.id){
+                if(self.messages[i].id == message.id){
                     self.messages[i].destroy();
-                    if(message.datasets.id>0){
+                    if(message.id>0){
                         self.messages[i] = message;
                         return true;
                     } else {
@@ -1087,8 +1078,8 @@ openerp.mail = function(session) {
         insert_message: function (message) {
             var self=this;
 
-            if(this.datasets.show_compose_message && 
-                this.options.display_indented_thread > self.datasets.thread_level){
+            if(this.show_compose_message && 
+                this.options.display_indented_thread > self.thread_level){
                 this.ComposeMessage.do_show_compact();
             }
 
@@ -1097,7 +1088,7 @@ openerp.mail = function(session) {
             // insert on hierarchy display => insert in self child
             var thread_messages = self.messages;
             var thread = self;
-            if( self.options.display_indented_thread < self.datasets.thread_level ) {
+            if( self.options.display_indented_thread < self.thread_level ) {
                 var thread =  self.options._parents[self.options.display_indented_thread] || self.options._parents[0];
                 var thread_messages = [];
                 _(thread.get_childs()).each(function (val, key) { thread_messages.push(val.parent_message); });
@@ -1106,23 +1097,23 @@ openerp.mail = function(session) {
             // check older and newer message for insertion
             var parent_newer = false;
             var parent_older = false;
-            if(message.datasets.id > 0){
+            if(message.id > 0){
                 for(var i in thread_messages){
-                    if(thread_messages[i].datasets.id > message.datasets.id){
+                    if(thread_messages[i].id > message.id){
                         if(!parent_newer || 
-                            parent_newer.datasets.id > thread_messages[i].datasets.id) {
+                            parent_newer.id > thread_messages[i].id) {
                             parent_newer = thread_messages[i];
                         }
-                    } else if(thread_messages[i].datasets.id > 0 && thread_messages[i].datasets.id < message.datasets.id) {
+                    } else if(thread_messages[i].id > 0 && thread_messages[i].id < message.id) {
                         if(!parent_older || 
-                            parent_older.datasets.id < thread_messages[i].datasets.id) {
+                            parent_older.id < thread_messages[i].id) {
                             parent_older = thread_messages[i];
                         }
                     }
                 }
             }
 
-            var sort = (!!self.datasets.thread_level || message.datasets.id<0);
+            var sort = (!!self.thread_level || message.id<0);
 
             if(parent_older){
                 if(sort){
@@ -1131,13 +1122,13 @@ openerp.mail = function(session) {
                     message.insertBefore(parent_older.$el);
                 }
             } else if(parent_newer){
-                if(sort || parent_newer.datasets.id<0){
+                if(sort || parent_newer.id<0){
                     message.insertBefore(parent_newer.$el);
                 } else {
                     message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
                 }
             } else {
-                if(sort && message.datasets.id>0) {
+                if(sort && message.id>0) {
                     message.prependTo(thread.$el);
                 } else {
                     message.appendTo(thread.$el);
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 54dbc4f9ded..07fefa0304b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,7 +17,7 @@
     <t t-name="mail.compose_message">
         <div class="oe_msg oe_msg_composer">
             <div class="oe_msg_left">
-                <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.datasets.avatar}"/>
+                <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
@@ -70,8 +70,8 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <ul t-attf-class="oe_msg_attachments #{widget.datasets.attachment_ids[0]?'':'oe_hidden'}">
-            <t t-foreach="widget.datasets.attachment_ids" t-as="attachment">
+        <ul t-attf-class="oe_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
+            <t t-foreach="widget.attachment_ids" t-as="attachment">
                 <li>
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
@@ -105,13 +105,13 @@
     <t t-name="mail.thread.list_recipients">
         <div class="oe_mail_list_recipients">
             Post to:
-            <span t-if="!widget.datasets.is_private" class="oe_all_follower">All Followers</span> 
-            <t t-if="!widget.datasets.is_private and widget.datasets.partner_ids.length"> and </t>
+            <span t-if="!widget.is_private" class="oe_all_follower">All Followers</span> 
+            <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
             <t t-set="inc" t-value="0"/>
-            <t t-if="widget.datasets.partner_ids.length" t-foreach="widget.datasets.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
             </t>
-            <t t-if="widget.datasets.partner_ids.length>=3">
-                <span class="oe_more">, <a><t t-raw="widget.datasets.partner_ids.length-3"/> others...</a></span>
+            <t t-if="widget.partner_ids.length>=3">
+                <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
             </t>
         </div>
@@ -185,45 +185,45 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
+                    <a t-if="widget.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
+                    <a t-if="widget.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
+                    <a t-if="widget.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
                 </div>
             </div>
 
             <div class='oe_msg_left'>
-                <a t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}" t-att-title="widget.datasets.author_id[1]">
-                    <img class="oe_msg_icon" t-att-src="widget.datasets.avatar"/>
+                <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                    <img class="oe_msg_icon" t-att-src="widget.avatar"/>
                 </a>
             </div>
 
             <div class="oe_msg_center">
                 <!-- message itself -->
                 <div class="oe_msg_content">
-                    <h1 t-if="widget.datasets.subject" class="oe_msg_title">
-                        <t t-raw="widget.datasets.subject"/>
+                    <h1 t-if="widget.subject" class="oe_msg_title">
+                        <t t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <t t-if="widget.options.show_record_name and widget.datasets.record_name and (!widget.datasets.subject) and !widget.options.thread_level and !widget.options.display_on_thread[0] and widget.datasets.model!='res.partner'">
-                            <a class="oe_mail_action_model" t-attf-href="#model=#{widget.datasets.model}&amp;id=#{widget.datasets.res_id}"><t t-raw="widget.datasets.record_name"/></a>
+                        <t t-if="widget.options.show_record_name and widget.record_name and (!widget.subject) and !widget.options.thread_level and !widget.options.display_on_thread[0] and widget.model!='res.partner'">
+                            <a class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a>
                         </t>
-                        <t t-raw="widget.datasets.body"/>
+                        <t t-raw="widget.body"/>
                     </div>
-                    <t t-if="widget.datasets.attachment_ids.length > 0">
+                    <t t-if="widget.attachment_ids.length > 0">
                         <t t-call="mail.thread.message.attachments"/>
                     </t>
                 </div>
                 <div class="oe_msg_footer">
-                    <a t-if="widget.datasets.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}"><t t-raw="widget.datasets.author_id[1]"/></a>
-                    <span t-att-title="widget.datasets.date"><t t-raw="widget.datasets.timerelative"/></span>
-                        <a t-if="widget.datasets.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
-                            <t t-if="widget.datasets.attachment_ids.length == 1">1 Attachment</t>
-                            <t t-if="widget.datasets.attachment_ids.length > 1"><t t-raw="widget.datasets.attachment_ids.length"/> Attachments</t>
+                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
+                        <a t-if="widget.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
+                            <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
+                            <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
                         </a>
                     <t t-call="mail.thread.message.vote"/>
                 </div>
@@ -233,9 +233,9 @@
 
     <!-- expandable message layout -->
     <t t-name="mail.thread.expandable">
-        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_unread">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
             <div class="oe_msg_content oe_msg_more_message">
-                <a class="oe_msg_fetch_more">Load more messages <span t-if="widget.datasets.nb_messages>0">(<t t-raw="widget.datasets.nb_messages"/> messages not display)</span>...</a>
+                <a class="oe_msg_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
             </div>
         </div>
     </t>
@@ -255,22 +255,22 @@
     -->
     <span t-name="mail.thread.message.vote">
         <span class="oe_left oe_mail_vote_count">
-            <t t-if='widget.datasets.has_voted'>
+            <t t-if='widget.has_voted'>
                 You
             </t>
-            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
-                <t t-if='widget.datasets.has_voted'> and </t>
-                <t t-esc="widget.datasets.vote_nb"/> people
+            <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
+                <t t-if='widget.has_voted'> and </t>
+                <t t-esc="widget.vote_nb"/> people
             </t>
-            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
-                <t t-raw="(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0))"/>
+            <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
+                <t t-raw="(widget.vote_nb - (widget.has_voted ? 1 : 0))"/>
                 concur
             </t>
         </span>
         <button t-attf-class="oe_msg_vote oe_tag">
             <span>
-                <t t-if="!widget.datasets.has_voted">Concur</t>
-                <t t-if="widget.datasets.has_voted">Respectfully disagree</t>
+                <t t-if="!widget.has_voted">Concur</t>
+                <t t-if="widget.has_voted">Respectfully disagree</t>
             </span>
         </button>
     </span>
@@ -279,6 +279,6 @@
         Template used to display stared/unstared message in a mail.message
     -->
     <t t-name="mail.thread.message.star">
-         <a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a>
+         <a t-attf-class="oe_mail_starbox #{widget.has_stared?'oe_stared':''}">*</a>
     </t>
 </template>

From 87afad0a4df19a38787e452f685110766099fa2c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 10:59:02 +0200
Subject: [PATCH 031/106] [IMP] mail.js: more comment

bzr revid: chm@openerp.com-20121022085902-kxb9jhdmknhmdg7x
---
 addons/mail/static/src/js/mail.js | 154 ++++++++++++++++++++++--------
 1 file changed, 114 insertions(+), 40 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 042a8cecf6a..d70be673fd4 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -7,7 +7,7 @@ openerp.mail = function(session) {
     openerp_mail_followers(session, mail);        // import mail_followers.js
 
     /**
-     * ------------------------------------------------------------
+         * ------------------------------------------------------------
      * FormView
      * ------------------------------------------------------------
      * 
@@ -38,7 +38,7 @@ openerp.mail = function(session) {
 
 
     /**
-     * ------------------------------------------------------------
+         * ------------------------------------------------------------
      * ChatterUtils
      * ------------------------------------------------------------
      * 
@@ -51,17 +51,20 @@ openerp.mail = function(session) {
 
     mail.ChatterUtils = {
 
-        /** Get an image in /web/binary/image?... */
+        /**
+         *Get an image in /web/binary/image?... */
         get_image: function(session, model, field, id) {
             return session.prefix + '/web/binary/image?session_id=' + session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
-        /** Get the url of an attachment {'id': id} */
+        /**
+         *Get the url of an attachment {'id': id} */
         get_attachment_url: function (session, attachment) {
             return session.origin + '/web/binary/saveas?session_id=' + session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id=' + attachment['id'];
         },
 
-        /** Replaces some expressions
+        /**
+         *Replaces some expressions
          * - :name - shortcut to an image
          */
         do_replace_expressions: function (string) {
@@ -91,7 +94,7 @@ openerp.mail = function(session) {
 
 
     /**
-     * ------------------------------------------------------------
+         * ------------------------------------------------------------
      * ComposeMessage widget
      * ------------------------------------------------------------
      * 
@@ -420,8 +423,8 @@ openerp.mail = function(session) {
         }
     });
 
-    /** 
-     * ------------------------------------------------------------
+    /**
+         * ------------------------------------------------------------
      * Thread Message Expandable Widget
      * ------------------------------------------------------------
      *
@@ -493,13 +496,13 @@ openerp.mail = function(session) {
             this.flag_used = true;
 
             this.animated_destroy({'fadeTime':300});
-            this.parent_thread.message_fetch(false, this.domain, this.context);
+            this.parent_thread.message_fetch(this.domain, this.context);
             return false;
         },
     });
 
-    /** 
-     * ------------------------------------------------------------
+    /**
+         * ------------------------------------------------------------
      * Thread Message Widget
      * ------------------------------------------------------------
      * This widget handles the display of a messages in a thread. 
@@ -554,7 +557,7 @@ openerp.mail = function(session) {
             this.has_voted = datasets.has_voted ||  false,
             this.is_favorite = datasets.is_favorite ||  false,
             this.thread_level = datasets.thread_level ||  0,
-            this.to_read = datasets.to_read ||  true,
+            this.to_read = datasets.to_read || false,
             this.author_id = datasets.author_id ||  [],
             this.attachment_ids = datasets.attachment_ids ||  [],
             this._date = datasets.date;
@@ -585,6 +588,9 @@ openerp.mail = function(session) {
             this.ds_follow = new session.web.DataSetSearch(this, 'mail.followers');
         },
 
+        /**
+         *Convert date, timerelative and avatar in displayable data.
+        */
         formating_data: function(){
 
             //formating and add some fields for render
@@ -634,6 +640,9 @@ openerp.mail = function(session) {
             this.$el.on('click', 'a.oe_mail_starbox', this.on_star);
         },
 
+        /**
+         * call the on_compose_message on the thread of this message.
+         */
         on_message_reply:function(event){
             event.stopPropagation();
             this.thread.on_compose_message();
@@ -651,6 +660,10 @@ openerp.mail = function(session) {
                 });
         },
 
+        /**
+         * instantiate the thread object of this message.
+         * Each message have only one thread.
+         */
         create_thread: function(){
             if(this.thread){
                 return false;
@@ -670,6 +683,10 @@ openerp.mail = function(session) {
             this.thread.insertAfter(this.$el);
         },
         
+        /**
+         * Fade out the message and his child thread.
+         * Then this object is destroyed.
+         */
         animated_destroy: function(options) {
             var self=this;
             //graphic effects  
@@ -683,6 +700,10 @@ openerp.mail = function(session) {
             }
         },
 
+        /**
+         * Wait a confirmation for delete the message on the DB.
+         * Make an animate destroy
+         */
         on_message_delete: function (event) {
             event.stopPropagation();
             if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
@@ -715,7 +736,9 @@ openerp.mail = function(session) {
             return false;
         },
 
-        /** browse message
+        /**
+         * search a message in all thread and child thread.
+         * This method return an object message.
          * @param {object}{int} option.id
          * @param {object}{string} option.model
          * @param {object}{boolean} option._go_thread_wall
@@ -745,7 +768,8 @@ openerp.mail = function(session) {
             return false;
         },
 
-        /* get all child message/thread id linked
+        /* get all child message id linked.
+         * @return array of id
         */
         get_child_ids: function(){
             var res=[]
@@ -756,6 +780,9 @@ openerp.mail = function(session) {
             return res;
         },
 
+        /**
+         * add or remove a vote for a message and display the result
+        */
         on_vote: function (event) {
             event.stopPropagation();
             var self=this;
@@ -768,7 +795,9 @@ openerp.mail = function(session) {
             return false;
         },
 
-        // Render vote Display template.
+        /**
+         * Display the render of this message's vote
+        */
         display_vote: function () {
             var self = this;
             var vote_element = session.web.qweb.render('mail.thread.message.vote', {'widget': self});
@@ -776,7 +805,9 @@ openerp.mail = function(session) {
             self.$(".oe_mail_vote_count:first").replaceWith(vote_element);
         },
 
-        // Stared/unstared + Render star.
+        /**
+         * add or remove a favorite (or starred) for a message and change class on the DOM
+        */
         on_star: function (event) {
             event.stopPropagation();
             var self=this;
@@ -797,8 +828,8 @@ openerp.mail = function(session) {
 
     });
 
-    /** 
-     * ------------------------------------------------------------
+    /**
+         * ------------------------------------------------------------
      * Thread Widget
      * ------------------------------------------------------------
      *
@@ -871,6 +902,9 @@ openerp.mail = function(session) {
             this.bind_events();
         },
 
+        /* instantiate the compose message object and insert this on the DOM.
+        * The compose message is display in compact form.
+        */
         instantiate_ComposeMessage: function(){
             // add message composition form view
             this.ComposeMessage = new mail.ThreadComposeMessage(this, this, {
@@ -916,19 +950,26 @@ openerp.mail = function(session) {
             self.$el.on('click', '.oe_mail_compose_textarea .oe_more_hidden', self.on_hide_recipients);
         },
 
+        /**
+         *show all the partner list of this parent message
+        */
         on_show_recipients: function(){
             var p=$(this).parent(); 
             p.find('.oe_more_hidden, .oe_hidden').show(); 
             p.find('.oe_more').hide(); 
         },
 
+        /**
+         *hide a part of the partner list of this parent message
+        */
         on_hide_recipients: function(){
             var p=$(this).parent(); 
             p.find('.oe_more_hidden, .oe_hidden').hide(); 
             p.find('.oe_more').show(); 
         },
 
-        /* get all child message/thread id linked
+        /* get all child message/thread id linked.
+         * @return array of id
         */
         get_child_ids: function(){
             var res=[];
@@ -936,7 +977,9 @@ openerp.mail = function(session) {
             return res;
         },
 
-        /* get all child message/thread linked
+        /* get all child message/thread linked.
+         * @param {int} nb_thread_level, number of traversed thread level for this search
+         * @return array of thread object
         */
         get_childs: function(nb_thread_level){
             var res=[];
@@ -951,7 +994,9 @@ openerp.mail = function(session) {
             return res;
         },
 
-        /** browse thread
+        /**
+         *search a thread in all thread and child thread.
+         * This method return an object thread.
          * @param {object}{int} option.id
          * @param {object}{string} option.model
          * @param {object}{boolean} option._go_thread_wall
@@ -987,19 +1032,24 @@ openerp.mail = function(session) {
             return false;
         },
 
-        /** browse message
+        /**
+         *search a message in all thread and child thread.
+         * This method return an object message.
          * @param {object}{int} option.id
          * @param {object}{string} option.model
          * @param {object}{boolean} option._go_thread_wall
          *      private for check the top thread
-         * @return thread object
+         * @return message object
          */
         browse_message: function(options){
             if(this.options._parents[0].messages[0])
                 return this.options._parents[0].messages[0].browse_message(options);
         },
 
-        /* this function is launch when a user click on "Reply" button
+        /**
+         *If ComposeMessage doesn't exist, instantiate the compose message.
+        * Call the on_compose_expandable method to allow the user to write his message.
+        * (Is call when a user click on "Reply" button)
         */
         on_compose_message: function(){
             if(!this.ComposeMessage){
@@ -1010,17 +1060,22 @@ openerp.mail = function(session) {
             this.ComposeMessage.on_compose_expandable();
         },
 
-        /* display the no message on the thread
+        /**
+         *display the message "there are no message" on the thread
         */
         no_message: function(){
             $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$el);
         },
 
-        /** Fetch messages
+        /**
+         *make a request to read the message (calling RPC to "message_read").
+         * The result of this method is send to the switch message for sending ach message to
+         * his parented object thread.
          * @param {Array} replace_domain: added to this.domain
          * @param {Object} replace_context: added to this.context
+         * @param {Array} ids read (if the are some ids, the method don't use the domain)
          */
-        message_fetch: function (initial_mode, replace_domain, replace_context, ids, callback) {
+        message_fetch: function (replace_domain, replace_context, ids) {
             var self = this;
 
             // domain and context: options + additional
@@ -1032,7 +1087,11 @@ openerp.mail = function(session) {
                 ).then(this.proxy('switch_new_message'));
         },
 
-        /* create record object and linked him
+        /**
+         *create the message object and attached on this thread.
+         * When the message object is create, this method call insert_message for,
+         * displaying this message on the DOM.
+         * @param : {object} data from calling RPC to "message_read"
          */
         create_message_object: function (data) {
             var self = this;
@@ -1074,7 +1133,15 @@ openerp.mail = function(session) {
             self.messages.push( message );
         },
 
-        /** Displays a message or an expandable message  */
+        /**
+         *insert the message on the DOM.
+         * All message (and expandable message) are sorted. The method get the
+         * older and newer message to insert the message (before, after).
+         * If there are no older or newer, the message is prepend or append to
+         * the thread (parent object or on root thread for flat view).
+         * The sort is define by the thread_level (O for newer on top).
+         * @param : {object} ThreadMessage object
+         */
         insert_message: function (message) {
             var self=this;
 
@@ -1143,7 +1210,11 @@ openerp.mail = function(session) {
             return message
         },
         
-        /*  Send the records to his parent thread */
+        /**
+         *get the parent thread of the messages.
+         * Each message is send to his parent object for creating the object message.
+         * @param : {Array} datas from calling RPC to "message_read"
+         */
         switch_new_message: function(records) {
             var self=this;
             _(records).each(function(record){
@@ -1155,8 +1226,8 @@ openerp.mail = function(session) {
         },
     });
 
-    /** 
-     * ------------------------------------------------------------
+    /**
+         * ------------------------------------------------------------
      * mail : root Widget
      * ------------------------------------------------------------
      *
@@ -1224,9 +1295,12 @@ openerp.mail = function(session) {
             this.bind_events();
         },
 
+        
         /**
-         * Display the threads
-          */
+         *Create the root thread and display this object in the DOM.
+         * Call the no_message method then c all the message_fetch method 
+         * of this root thread to display the messages.
+         */
         message_render: function (search) {
 
             this.thread = new mail.Thread(this, {}, {
@@ -1254,8 +1328,8 @@ openerp.mail = function(session) {
     });
 
 
-    /** 
-     * ------------------------------------------------------------
+    /**
+         * ------------------------------------------------------------
      * mail_thread Widget
      * ------------------------------------------------------------
      *
@@ -1321,8 +1395,8 @@ openerp.mail = function(session) {
     });
 
 
-    /** 
-     * ------------------------------------------------------------
+    /**
+         * ------------------------------------------------------------
      * Wall Widget
      * ------------------------------------------------------------
      *
@@ -1397,7 +1471,7 @@ openerp.mail = function(session) {
 
 
         /**
-         * Display the threads
+         *Create the root thread widget and display this object in the DOM
           */
         message_render: function (search) {
             var domain = this.options.domain.concat(this.search_results['domain']);
@@ -1426,7 +1500,7 @@ openerp.mail = function(session) {
 
 
     /**
-     * ------------------------------------------------------------
+         * ------------------------------------------------------------
      * UserMenu
      * ------------------------------------------------------------
      * 

From ef906635277ba643d212344b4b3c4ae019ca79eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 22 Oct 2012 12:17:40 +0200
Subject: [PATCH 032/106] [IMP] mail: reordered mail icons, made lvl>0 message
 more compact

bzr revid: fva@openerp.com-20121022101740-5406solezsuvthr9
---
 addons/mail/static/src/css/mail.css | 9 +++++++++
 addons/mail/static/src/xml/mail.xml | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index cdbc9701703..040acc55c87 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -26,6 +26,15 @@
     background: #FFF;
     border: none;
     margin-bottom:0px;
+    min-height:34px;
+}
+.openerp .oe_mail .oe_msg:not(.oe_lvl_0) .oe_msg_icon{
+    width:32px;
+    margin:1px;
+    border-radius:2px;
+}
+.openerp .oe_mail .oe_msg:not(.oe_lvl_0) .oe_msg_center{
+    margin-left:34px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 50247fd6164..01cdb9b629e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -189,10 +189,10 @@
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-                    <t t-call="mail.thread.message.star"/>
-                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
-                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
+                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
+                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
                     <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">)</a></span>
+                    <t t-call="mail.thread.message.star"/>
                 </div>
             </div>
 

From ebd9ceba11b32f3bfd6ad7a3b9f4dcd2f306c692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 22 Oct 2012 13:36:51 +0200
Subject: [PATCH 033/106] [FIX] mail_message: fixed default args for
 message_read, using list assignation in args could lead to weird default
 parameter args because of the method re-using the same list.

bzr revid: tde@openerp.com-20121022113651-u0yn40e8zltwbf4f
---
 addons/mail/mail_message.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 52878a34e10..37a62505c48 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -263,6 +263,7 @@ class mail_message(osv.Model):
                 ('parent_id', '=', message['id']),
                 ('id', 'not in', message_loaded_ids),
                 ], context=context, limit=self._message_read_more_limit)
+            # TDE note: avoid using dummy None values, maybe id_min 0, id_max max(list)
             # group childs not read
             id_min = None
             id_max = None
@@ -331,7 +332,7 @@ class mail_message(osv.Model):
         except (orm.except_orm, osv.except_osv):
             return False
 
-    def message_read(self, cr, uid, ids=False, domain=[], message_unload_ids=[], context=None, parent_id=False, limit=None):
+    def message_read(self, cr, uid, ids=False, domain=None, message_unload_ids=None, context=None, parent_id=False, limit=None):
         """ Read messages from mail.message, and get back a list of structured
             messages to be displayed as discussion threads. If IDs is set,
             fetch these records. Otherwise use the domain to fetch messages.
@@ -353,6 +354,8 @@ class mail_message(osv.Model):
                 ancestors and expandables
             :return list: list of message structure for the Chatter widget
         """
+        domain = domain if domain is not None else []
+        message_unload_ids = message_unload_ids if message_unload_ids is not None else []
         if message_unload_ids:
             domain += [('id', 'not in', message_unload_ids)]
         limit = limit or self._message_read_limit

From c186168b71c7e1fedd9cf34becde10ae7143026b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 22 Oct 2012 13:45:02 +0200
Subject: [PATCH 034/106] [REM] mail_message: removed max_limit arg of
 expandables.

bzr revid: tde@openerp.com-20121022114502-dgod5p1u4ixmdcla
---
 addons/mail/mail_message.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 37a62505c48..19178a5eab7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -312,7 +312,6 @@ class mail_message(osv.Model):
                 'type': 'expandable',
                 'parent_id': parent_id,
                 'id': -1,
-                'max_limit': True,
             })
 
         return message_list

From 09d5c74d95c6db0a2247c131d15ca17725b73c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 22 Oct 2012 14:58:42 +0200
Subject: [PATCH 035/106] [IMP] mail: nice colors for the message icons

bzr revid: fva@openerp.com-20121022125842-2t4m6axslu8tln8w
---
 addons/mail/static/src/css/mail.css | 45 +++++++++++++++++++++--------
 addons/mail/static/src/xml/mail.xml | 17 ++++-------
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 040acc55c87..22054686145 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -51,10 +51,6 @@
     display: block;
     margin-left: 40px;
 }
-.openerp .oe_mail .oe_msg .oe_msg_right{
-    float: right;
-    height: 24px;
-}
 .openerp .oe_mail .oe_msg .oe_msg_footer{
     height: 16px;
     padding-left: 4px;
@@ -73,21 +69,46 @@
     padding: 4px;
     padding-bottom:1px;
 }
-.openerp .oe_mail .oe_msg .oe_msg_right .oe_msg_icons span{
+.openerp .oe_mail .oe_msg .oe_msg_icons{
+    float: right;
+    margin-top: 4px;
+    margin-right: 8px;
+    height: 24px;
+    -webkit-user-select: none;
+}
+.openerp .oe_mail .oe_msg .oe_msg_icons span{
     float:right;
     width:24px;
     height:24px;
     line-height:24px;
     text-align: center;
-    opacity: 0.2;
-    -webkit-transition: opacity 0.2s linear;
 }
-.openerp .oe_mail .oe_msg:hover .oe_msg_right .oe_msg_icons span{
-    opacity: 1;
-    -webkit-transition: opacity 0.1s linear;
-}
-.openerp .oe_mail .oe_msg .oe_msg_right .oe_msg_icons a{
+.openerp .oe_mail .oe_msg .oe_msg_icons a {
     text-decoration: none;
+    /*opacity: 0.2;*/
+    color: #FFF;
+    text-shadow: 0px 1px #AAA,0px -1px #AAA, -1px 0px #AAA, 1px 0px #AAA, 0px 3px 3px rgba(0,0,0,0.2);
+    -webkit-transition: all 0.2s linear;
+}
+.openerp .oe_mail .oe_msg:hover .oe_msg_icons a{
+    opacity: 1;
+    -webkit-transition: all 0.1s linear;
+}
+.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_star a{
+    color: #FFE41F;
+    text-shadow: 0px 1px #DF6200,0px -1px #DF6200, -1px 0px #DF6200, 1px 0px #DF6200, 0px 3px 3px rgba(0,0,0,0.2);
+}
+.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_reply a{
+    color: #1fc0ff;
+    text-shadow: 0px 1px #184fc5,0px -1px #184fc5, -1px 0px #184fc5, 1px 0px #184fc5, 0px 3px 3px rgba(0,0,0,0.2);
+}
+.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_read a{
+    color: #c2ff00;
+    text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.2);
+}
+.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_unread a{
+    color: #c2ff00;
+    text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.2);
 }
 .openerp .oe_mail .oe_msg .oe_msg_content textarea{
     width: 100%;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 01cdb9b629e..614a3b5c325 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -187,14 +187,6 @@
     <t t-name="mail.thread.message">
         <div t-attf-class="oe_msg oe_lvl_#{widget.datasets.thread_level} oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
-            <div class='oe_msg_right'>
-                <div class="oe_msg_icons">
-                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
-                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
-                    <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">)</a></span>
-                    <t t-call="mail.thread.message.star"/>
-                </div>
-            </div>
 
             <div class='oe_msg_left'>
                 <a t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}" t-att-title="widget.datasets.author_id[1]">
@@ -203,6 +195,12 @@
             </div>
 
             <div class="oe_msg_center">
+                <div class='oe_msg_icons'>
+                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
+                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">W</a></span>
+                    <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
+                    <span class='oe_star'><a t-attf-class="oe_e oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">7</a></span>
+                </div>
                 <!-- message itself -->
                 <div class="oe_msg_content">
                     <h1 t-if="widget.datasets.subject" class="oe_msg_title">
@@ -280,7 +278,4 @@
     <!-- mail.thread.message.star
         Template used to display stared/unstared message in a mail.message
     -->
-    <t t-name="mail.thread.message.star">
-        <span><a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a></span>
-    </t>
 </template>

From 739694db06c0f25277eab0404cd43f2e943af410 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 15:32:47 +0200
Subject: [PATCH 036/106] [IMP] mail: concat expandable messages

bzr revid: chm@openerp.com-20121022133247-oen01b8ozq2cozhk
---
 addons/mail/mail_message.py         |   3 -
 addons/mail/static/src/js/mail.js   | 201 +++++++++++++++++++++++-----
 addons/mail/static/src/xml/mail.xml |   3 +-
 3 files changed, 165 insertions(+), 42 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index f561919939d..4e0fd04b6b8 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -230,8 +230,6 @@ class mail_message(osv.Model):
             # TDE note: is this useful ? to check
             'partner_ids': partner_ids,
             'parent_id': message['parent_id'] and message['parent_id'][0] or False,
-            # TDE note: see with CHM about votes, how they are displayed (only number, or name_get ?)
-            # vote: should only use number of votes
             'vote_nb': len(message['vote_user_ids']),
             'has_voted': has_voted,
             'is_private': message['model'] and message['res_id'],
@@ -310,7 +308,6 @@ class mail_message(osv.Model):
                 'type': 'expandable',
                 'parent_id': parent_id,
                 'id': -1,
-                'max_limit': True,
             })
 
         return message_list
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d70be673fd4..f6b6c0e43bc 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -89,6 +89,28 @@ openerp.mail = function(session) {
             return text
                 .replace(/[\n\r]/g,'<br/>')
                 .replace(/((?:https?|ftp):\/\/[\S]+)/g,'<a href="$1">$1</a> ')
+        },
+
+        /**
+         * return the complete domain with "&"
+         */
+        expend_domain: function (domain) {
+            var new_domain = [];
+            var nb_and = -1;
+            
+            for ( var k = domain.length-1; k >= 0 ; k-- ) {
+                if ( typeof domain[k] != 'array' ) {
+                    nb_and -= 2;
+                    continue;
+                }
+                nb_and += 1;
+            }
+
+            for (var k = 0; k < nb_and ; k++){
+                domain.unshift('&');
+            }
+
+            return domain;
         }
     };
 
@@ -134,6 +156,7 @@ openerp.mail = function(session) {
             this.parent_thread= parent.messages!= undefined ? parent : false;
 
             this.ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
+            this.show_delete_attachment = true;
 
             this.fileupload_id = _.uniqueId('oe_fileupload_temp');
             $(window).on(self.fileupload_id, self.on_attachment_loaded);
@@ -365,6 +388,7 @@ openerp.mail = function(session) {
                     ]).then(function(records){
                         self.parent_thread.switch_new_message(records);
                         self.on_cancel();
+                        self.do_show_compact();
                         //session.web.unblockUI();
                     });
                 return true;
@@ -454,7 +478,7 @@ openerp.mail = function(session) {
             this.nb_messages = datasets.nb_messages || 0,
             this.thread_level = datasets.thread_level || 0,
             this.type = 'expandable',
-            this.max_limit = datasets.max_limit || false,
+            this.max_limit = this.id < 0 || false,
             this.flag_used = false,
             this.parent_thread= parent.messages!= undefined ? parent : options.options._parents[0] ;
         },
@@ -465,12 +489,18 @@ openerp.mail = function(session) {
             this.bind_events();
         },
 
+        reinit: function () {
+            var $render = $(session.web.qweb.render('mail.thread.expandable', {'widget': this}));
+            this.$el.replaceWith( $render );
+            this.$el = $render;
+            this.bind_events();
+        },
+
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
         bind_events: function() {
-            var self = this;
-            this.$el.on('click', 'a.oe_msg_fetch_more', self.on_expandable);
+            this.$el.on('click', 'a.oe_msg_fetch_more', this.on_expandable);
         },
 
         animated_destroy: function(options) {
@@ -692,11 +722,11 @@ openerp.mail = function(session) {
             //graphic effects  
             if(options && options.fadeTime) {
                 self.$el.fadeOut(options.fadeTime, function(){
-                    self.destroy();
+                    self.parent_thread.message_to_expandable(self);
                 });
                 self.thread.$el.fadeOut(options.fadeTime);
             } else {
-                self.destroy();
+                self.parent_thread.message_to_expandable(self);
             }
         },
 
@@ -719,20 +749,19 @@ openerp.mail = function(session) {
         * @param {object} mouse envent
         */
         on_message_read_unread: function (event) {
-            // TDE note: code here seems complicated... just check that current message is read (value coming from server)
-            // and send its opposite to set_message_read
             event.stopPropagation();
-            // if this message is read, all childs message display is read
-            var ids = [this.id].concat( this.get_child_ids() );
-            var read = $(event.srcElement).hasClass("oe_read");
-            this.$el.removeClass(read ? 'oe_msg_unread':'oe_msg_read').addClass(read ? 'oe_msg_read':'oe_msg_unread');
+            var self=this;
 
-            if( (read && this.options.typeof_thread == 'inbox') ||
-                (!read && this.options.typeof_thread == 'archives')) {
+            if( (this.to_read && this.options.typeof_thread == 'inbox') ||
+                (!this.to_read && this.options.typeof_thread == 'archives')) {
                 this.animated_destroy({fadeTime:250});
             }
-            // TDE note: should have a context here
-            this.ds_notification.call('set_message_read', [ids, read]);
+
+            // if this message is read, all childs message display is read
+            this.ds_notification.call('set_message_read', [ [this.id].concat( this.get_child_ids() ) , this.to_read, this.context]).pipe(function(){
+                self.$el.removeClass(this.to_read ? 'oe_msg_unread':'oe_msg_read').addClass(self.to_read ? 'oe_msg_read':'oe_msg_unread');
+                self.to_read = !self.to_read;
+            });
             return false;
         },
 
@@ -787,8 +816,7 @@ openerp.mail = function(session) {
             event.stopPropagation();
             var self=this;
             return this.ds_message.call('vote_toggle', [[self.id]]).pipe(function(vote){
-                // TDE note: to update, because vote_user_ids is about to disappear to be replaced by vote_nb (number of votes)
-                self.has_voted=vote;
+                self.has_voted = vote;
                 self.vote_nb += self.has_voted ? 1 : -1;
                 self.display_vote();
             });
@@ -929,7 +957,7 @@ openerp.mail = function(session) {
             this.$('.oe_msg_expandable:last');
 
             var message = this.messages[this.messages.length-1];
-            if(message && message.type=="expandable" && message.max_limit){
+            if(message && message.type=="expandable" && message.max_limit) {
                 var pos = message.$el.position();
                 if(pos.top){
                     /* bottom of the screen */
@@ -1016,11 +1044,12 @@ openerp.mail = function(session) {
                 return this;
             }
 
-            if(options.id)
-            for(var i in this.messages){
-                if(this.messages[i].thread){
-                    var res=this.messages[i].thread.browse_thread({'id':options.id, '_go_thread_wall':true});
-                    if(res) return res;
+            if(options.id){
+                for(var i in this.messages){
+                    if(this.messages[i].thread){
+                        var res=this.messages[i].thread.browse_thread({'id':options.id, '_go_thread_wall':true});
+                        if(res) return res;
+                    }
                 }
             }
 
@@ -1167,13 +1196,11 @@ openerp.mail = function(session) {
             if(message.id > 0){
                 for(var i in thread_messages){
                     if(thread_messages[i].id > message.id){
-                        if(!parent_newer || 
-                            parent_newer.id > thread_messages[i].id) {
+                        if(!parent_newer || parent_newer.id > thread_messages[i].id) {
                             parent_newer = thread_messages[i];
                         }
                     } else if(thread_messages[i].id > 0 && thread_messages[i].id < message.id) {
-                        if(!parent_older || 
-                            parent_older.id < thread_messages[i].id) {
+                        if(!parent_older || parent_older.id < thread_messages[i].id) {
                             parent_older = thread_messages[i];
                         }
                     }
@@ -1182,23 +1209,41 @@ openerp.mail = function(session) {
 
             var sort = (!!self.thread_level || message.id<0);
 
-            if(parent_older){
-                if(sort){
-                    message.insertAfter(parent_older.thread ? parent_older.thread.$el : parent_older.$el);
-                } else {
-                    message.insertBefore(parent_older.$el);
-                }
-            } else if(parent_newer){
-                if(sort || parent_newer.id<0){
+
+            if (sort) {
+                if (parent_older) {
+
+                    message.insertAfter(parent_older.$el);
+
+                } else if(parent_newer) {
+
                     message.insertBefore(parent_newer.$el);
+
+                } else if(message.id < 0) {
+
+                    message.appendTo(thread.$el);
+
                 } else {
-                    message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
+
+                    message.prependTo(thread.$el);
                 }
             } else {
-                if(sort && message.id>0) {
+                if (parent_older) {
+
+                    message.insertBefore(parent_older.$el);
+
+                } else if(parent_newer) {
+
+                    message.insertAfter(parent_newer.$el);
+
+                } else if(message.id < 0) {
+
                     message.prependTo(thread.$el);
+
                 } else {
+
                     message.appendTo(thread.$el);
+
                 }
             }
 
@@ -1224,6 +1269,88 @@ openerp.mail = function(session) {
                 }).create_message_object( record );
             });
         },
+
+        /**
+         * Convert a destroyed message into a expandable message
+         */
+        message_to_expandable: function (message) {
+
+            if(!this.thread_level || message.isDestroyed()) {
+                message.destroy();
+                return false;
+            }
+
+            var messages = _.sortBy( _.filter(this.messages, function (val) { return !val.isDestroyed(); }), function (val) { return val.id; });
+            var it = _.indexOf( messages, message );
+
+            var msg_up = messages[it-1];
+            var msg_down = messages[it+1];
+
+            var message_dom = [ '&', ["id","in",[message.id]], ['parent_id', '=', message.parent_id] ];
+
+            if ( msg_up && msg_up.type == "expandable" && msg_down && msg_down.type == "expandable") {
+                // concat two expandable message and add this message to this dom
+                msg_up.domain = mail.ChatterUtils.expend_domain( msg_up.domain );
+                msg_down.domain = mail.ChatterUtils.expend_domain( msg_down.domain );
+
+                msg_down.domain = ['|','|'].concat( msg_up.domain ).concat( message_dom ).concat( msg_down.domain );
+
+                if( !msg_down.max_limit ){
+                    msg_down.nb_messages += 1 + msg_up.nb_messages;
+                }
+
+                msg_up.$el.remove();
+                msg_up.destroy();
+
+                msg_down.reinit();
+
+            } else if ( msg_up && msg_up.type == "expandable") {
+                // concat preview expandable message and this message to this dom
+                msg_up.domain = mail.ChatterUtils.expend_domain( msg_up.domain );
+                msg_up.domain = ['|'].concat( msg_up.domain ).concat( message_dom );
+                
+                msg_up.nb_messages++;
+
+                msg_up.reinit();
+
+            } else if ( msg_down && msg_down.type == "expandable") {
+                // concat next expandable message and this message to this dom
+                msg_down.domain = mail.ChatterUtils.expend_domain( msg_down.domain );
+                msg_down.domain = ['|'].concat( msg_down.domain ).concat( message_dom );
+                
+                // it's maybe a message expandable for the max limit read message
+                if( !msg_down.max_limit ){
+                    msg_down.nb_messages++;
+                }
+                
+                msg_down.reinit();
+
+            } else {
+                // create a expandable message
+                var expandable = new mail.ThreadExpandable(this, {
+                    'id': message.id,
+                    'model': message.model,
+                    'parent_id': message.parent_id,
+                    'nb_messages': 1,
+                    'thread_level': message.thread_level,
+                    }, {
+                    'domain': message_dom,
+                    'context': {
+                        'default_model': message.model || this.context.default_model,
+                        'default_res_id': message.res_id || this.context.default_res_id,
+                        'default_parent_id': this.id },
+                });
+
+                // add object on array and DOM
+                this.messages.push(expandable);
+                expandable.insertAfter(message.$el);
+            }
+
+            // destroy message
+            message.destroy();
+
+            return true;
+        },
     });
 
     /**
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 07fefa0304b..a1c5169ad36 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -82,10 +82,9 @@
                     <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
-                    <t t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)">
+                    <t t-if="(widget.show_delete_attachment and (!attachment.upload or attachment.percent_loaded&gt;=100))">
                         <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
                     </t>
-
                 </li>
             </t>
         </ul>

From eaa40d0c0cc8f6eaeeacca7aec3e7fae8382a1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 22 Oct 2012 16:19:32 +0200
Subject: [PATCH 037/106] [IMP] further work on the icons

bzr revid: fva@openerp.com-20121022141932-xbdorr3287748zfw
---
 addons/mail/static/src/css/mail.css | 8 ++------
 addons/mail/static/src/js/mail.js   | 9 +++++----
 addons/mail/static/src/xml/mail.xml | 2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 9dd18b0fec5..d2c84f38b1a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -97,7 +97,7 @@
     opacity: 1;
     -webkit-transition: all 0.1s linear;
 }
-.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_star a{
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_star.oe_starred a{
     color: #FFE41F;
     text-shadow: 0px 1px #DF6200,0px -1px #DF6200, -1px 0px #DF6200, 1px 0px #DF6200, 0px 3px 3px rgba(0,0,0,0.2);
 }
@@ -105,11 +105,7 @@
     color: #1fc0ff;
     text-shadow: 0px 1px #184fc5,0px -1px #184fc5, -1px 0px #184fc5, 1px 0px #184fc5, 0px 3px 3px rgba(0,0,0,0.2);
 }
-.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_read a{
-    color: #c2ff00;
-    text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.2);
-}
-.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_unread a{
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_unread a{
     color: #c2ff00;
     text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.2);
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2c8ab4f5b98..77cb3a1938a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -669,7 +669,7 @@ openerp.mail = function(session) {
             // event: click on 'Vote' button
             this.$el.on('click', '.oe_msg_vote', this.on_vote);
             // event: click on 'starred/favorite' button
-            this.$el.on('click', '.oe_mail_starbox', this.on_star);
+            this.$el.on('click', '.oe_star', this.on_star);
         },
 
         /**
@@ -839,15 +839,16 @@ openerp.mail = function(session) {
          * add or remove a favorite (or starred) for a message and change class on the DOM
         */
         on_star: function (event) {
+            console.log('on_star');
             event.stopPropagation();
             var self=this;
-            var button = self.$('button.oe_mail_starbox:first');
+            var button = self.$('.oe_star:first');
             return this.ds_message.call('favorite_toggle', [[self.id]]).pipe(function(star){
                 self.is_favorite=star;
                 if(self.is_favorite){
-                    button.addClass('oe_stared');
+                    button.addClass('oe_starred');
                 } else {
-                    button.removeClass('oe_stared');
+                    button.removeClass('oe_starred');
                     if( self.options.typeof_thread == 'stared' ) {
                         self.animated_destroy({fadeTime:250});
                     }
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 2c92aabfde5..a4fbaa71305 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -197,7 +197,7 @@
                     <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
                     <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Set back to unread" class="oe_e">W</a></span>
                     <span class='oe_reply' t-if="widget.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
-                    <span class='oe_star'><a t-attf-class="oe_e oe_mail_starbox #{widget.has_stared?'oe_stared':''}">7</a></span>
+                    <span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Add To Favorites" class="oe_e">7</a></span>
                 </div>
                 <!-- message itself -->
                 <div class="oe_msg_content">

From 317d446df0876ccfd73703028470c7a47472d276 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 16:22:06 +0200
Subject: [PATCH 038/106] [IMP] mail: concat expandable messages +
 on_message_destroy

bzr revid: chm@openerp.com-20121022142206-6jc28owq41rapqw6
---
 addons/mail/static/src/js/mail.js | 36 +++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2c8ab4f5b98..d5c07b882ad 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -99,7 +99,7 @@ openerp.mail = function(session) {
             var nb_and = -1;
             
             for ( var k = domain.length-1; k >= 0 ; k-- ) {
-                if ( typeof domain[k] != 'array' ) {
+                if ( typeof domain[k] != 'array' && typeof domain[k] != 'object' ) {
                     nb_and -= 2;
                     continue;
                 }
@@ -110,8 +110,6 @@ openerp.mail = function(session) {
                 domain.unshift('&');
             }
 
-            console.log( JSON.stringify(domain) );
-
             return domain;
         }
     };
@@ -531,6 +529,16 @@ openerp.mail = function(session) {
             this.parent_thread.message_fetch(this.domain, this.context);
             return false;
         },
+
+        /**
+         * call on_message_delete on his parent thread
+        */
+        destroy: function() {
+
+            this._super();
+            this.parent_thread.on_message_detroy(this);
+
+        }
     });
 
     /**
@@ -856,6 +864,16 @@ openerp.mail = function(session) {
             return false;
         },
 
+        /**
+         * call on_message_delete on his parent thread
+        */
+        destroy: function() {
+
+            this._super();
+            this.parent_thread.on_message_detroy(this);
+
+        }
+
     });
 
     /**
@@ -1112,9 +1130,9 @@ openerp.mail = function(session) {
             // domain and context: options + additional
             fetch_domain = replace_domain ? replace_domain : this.domain;
             fetch_context = replace_context ? replace_context : this.context;
-            var message_loaded = [this.id||0].concat( self.options._parents[0].get_child_ids() );
+            var message_loaded_ids = this.id ? [this.id].concat( self.get_child_ids() ) : self.get_child_ids();
 
-            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded, fetch_context, this.context.default_parent_id || undefined]
+            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, fetch_context, this.context.default_parent_id || undefined]
                 ).then(this.proxy('switch_new_message'));
         },
 
@@ -1269,6 +1287,12 @@ openerp.mail = function(session) {
             });
         },
 
+        on_message_detroy: function (message) {
+
+            this.messages = _.filter(this.messages, function (val) { return !val.isDestroyed(); });
+
+        },
+
         /**
          * Convert a destroyed message into a expandable message
          */
@@ -1279,7 +1303,7 @@ openerp.mail = function(session) {
                 return false;
             }
 
-            var messages = _.sortBy( _.filter(this.messages, function (val) { return !val.isDestroyed(); }), function (val) { return val.id; });
+            var messages = _.sortBy( this.messages, function (val) { return val.id; });
             var it = _.indexOf( messages, message );
 
             var msg_up = messages[it-1];

From fb1a0088572e4eef11653afae5d609066a48d7a8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 16:48:34 +0200
Subject: [PATCH 039/106] [IMP] mail: indented DOM class

bzr revid: chm@openerp.com-20121022144834-qqnk9etnfuyr25fr
---
 addons/mail/static/src/js/mail.js   | 8 ++++----
 addons/mail/static/src/xml/mail.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6e7310ac905..bbf68f7711c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -769,7 +769,7 @@ openerp.mail = function(session) {
 
             // if this message is read, all childs message display is read
             this.ds_notification.call('set_message_read', [ [this.id].concat( this.get_child_ids() ) , this.to_read, this.context]).pipe(function(){
-                self.$el.removeClass(this.to_read ? 'oe_msg_unread':'oe_msg_read').addClass(self.to_read ? 'oe_msg_read':'oe_msg_unread');
+                self.$el.removeClass(self.to_read ? 'oe_msg_unread':'oe_msg_read').addClass(self.to_read ? 'oe_msg_read':'oe_msg_unread');
                 self.to_read = !self.to_read;
             });
             return false;
@@ -934,7 +934,7 @@ openerp.mail = function(session) {
             this.thread_level =  (datasets.thread_level+1) || 0,
             this.partner_ids =  _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } ) 
             this.messages = [];
-            this.show_compose_message = this.options.show_compose_message && this.options.show_reply_button > this.thread_level;
+            this.show_compose_message = this.options.show_compose_message && (this.options.show_reply_button > this.thread_level || !this.thread_level);
 
             // object compose message
             this.ComposeMessage = false;
@@ -1464,7 +1464,7 @@ openerp.mail = function(session) {
             this.thread.no_message();
             this.thread.message_fetch();
 
-            if(this.options.show_compose_message){
+            if(this.options.show_compose_message && this.thread.ComposeMessage){
                 this.thread.ComposeMessage.do_show_compact();
             }
         },
@@ -1535,7 +1535,7 @@ openerp.mail = function(session) {
                 'context' : this.options.context,
                 'typeof_thread': this.options.context['typeof_thread'] || 'other',
                 'display_indented_thread': -1,
-                'show_reply_button': 10,
+                'show_reply_button': 0,
                 'show_read_unread_button': -1,
                 'show_compose_message': show_compose_message
                 }
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a4fbaa71305..1d5f3a9e239 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -184,7 +184,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_lvl_#{widget.thread_level} oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
 
             <div class='oe_msg_left'>
                 <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">

From 83078398652e9a6273f01035301966105e124b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 22 Oct 2012 17:12:16 +0200
Subject: [PATCH 040/106] [IMP] mail: buttons css mostly done

bzr revid: fva@openerp.com-20121022151216-wb4ul61vwjsgsviu
---
 addons/mail/static/src/css/mail.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d2c84f38b1a..276c9d28a15 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -97,14 +97,22 @@
     opacity: 1;
     -webkit-transition: all 0.1s linear;
 }
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_star:hover a{
+    color: #FFF6C0;
+    text-shadow: 0px 1px #FFA162,0px -1px #FFA162, -1px 0px #FFA162, 1px 0px #FFA162, 0px 3px 3px rgba(0,0,0,0.2);
+}
 .openerp .oe_mail .oe_msg .oe_msg_icons .oe_star.oe_starred a{
     color: #FFE41F;
     text-shadow: 0px 1px #DF6200,0px -1px #DF6200, -1px 0px #DF6200, 1px 0px #DF6200, 0px 3px 3px rgba(0,0,0,0.2);
 }
-.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_reply a{
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_reply:hover a{
     color: #1fc0ff;
     text-shadow: 0px 1px #184fc5,0px -1px #184fc5, -1px 0px #184fc5, 1px 0px #184fc5, 0px 3px 3px rgba(0,0,0,0.2);
 }
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_read:hover a{
+    color: #f3ffcd;
+    text-shadow: 0px 1px #59EB99,0px -1px #59EB99, -1px 0px #59EB99, 1px 0px #59EB99, 0px 3px 3px rgba(0, 0, 0, 0.2);
+}
 .openerp .oe_mail .oe_msg .oe_msg_icons .oe_unread a{
     color: #c2ff00;
     text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.2);

From a013e6e62f09aeb4927315ca576fe0a48490f886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 22 Oct 2012 18:46:38 +0200
Subject: [PATCH 041/106] [IMP] [WIP] mail: expandables now limited to one
 level (using a child_of based domain); simplified code. message_read updated
 to fetch the oldest possible ancestor, not all direct parents. Updated some
 tests. Still WIP, will be continued tomorrow.

bzr revid: tde@openerp.com-20121022164638-gqe5af1uxvl5h043
---
 addons/mail/mail_followers.py  |   1 +
 addons/mail/mail_message.py    | 111 +++++++++++++++++----------------
 addons/mail/tests/test_mail.py |  79 +++++++++++++++++------
 3 files changed, 118 insertions(+), 73 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 35603d2d720..52d26ebb51b 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -85,6 +85,7 @@ class mail_notification(osv.Model):
 
     def set_message_read(self, cr, uid, msg_ids, read=None, context=None):
         """ TDE note: add a comment, verify method calls, because js seems obfuscated. """
+        # TDE note: child_of to set unread ?
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         notif_ids = self.search(cr, uid, [('partner_id', '=', user_pid), ('message_id', 'in', msg_ids)], context=context)
 
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 19178a5eab7..1a650e8f67d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -198,19 +198,29 @@ class mail_message(osv.Model):
 
             :param dict message: read result of a mail.message
         """
+        is_author = False
+        if message['author_id']:
+            is_author = message['author_id'][0] == self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+
         has_voted = False
-        if uid in message['vote_user_ids']:
+        if uid in message.get('vote_user_ids'):
             has_voted = True
 
         is_favorite = False
-        if uid in message['favorite_user_ids']:
+        if uid in message.get('favorite_user_ids'):
             is_favorite = True
 
+        is_private = False
+        if message.get('model') and message.get('res_id'):
+            is_private = True
+
         try:
             attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, message['attachment_ids'], context=context)]
         except (orm.except_orm, osv.except_osv):
             attachment_ids = []
 
+        # TDE note: should we send partner_ids ?
+        # TDE note: shouldn't we separated followers and other partners ? costly to compute maybe ,
         try:
             partner_ids = self.pool.get('res.partner').name_get(cr, uid, message['partner_ids'], context=context)
         except (orm.except_orm, osv.except_osv):
@@ -227,15 +237,13 @@ class mail_message(osv.Model):
             'subject': message['subject'],
             'date': message['date'],
             'author_id': message['author_id'],
-            'is_author': message['author_id'] and message['author_id'][0] == uid,
+            'is_author': is_author,
             # TDE note: is this useful ? to check
             'partner_ids': partner_ids,
             'parent_id': message['parent_id'] and message['parent_id'][0] or False,
-            # TDE note: see with CHM about votes, how they are displayed (only number, or name_get ?)
-            # vote: should only use number of votes
             'vote_nb': len(message['vote_user_ids']),
             'has_voted': has_voted,
-            'is_private': message['model'] and message['res_id'],
+            'is_private': is_private,
             'is_favorite': is_favorite,
             'to_read': message['to_read'],
         }
@@ -250,69 +258,63 @@ class mail_message(osv.Model):
             :param dict read_messages: dict [id]: read result of the messages to
                 easily have access to their values, given their ID
         """
-        # sort for group items / TDE: move to message_read
-        # result = sorted(result, key=lambda k: k['id'])
-        tree_not = []
+        def _get_expandable(domain, message_nb, parent_id, id, model):
+            return {
+                'domain': domain,
+                'nb_messages': message_nb,
+                'type': 'expandable',
+                'parent_id': parent_id,
+                'id':  id,
+                # TDE note: why do we need model sometimes, and sometimes not ???
+                'model': model,
+            }
+        all_not_loaded_ids = []
         # expandable for not show message
         id_list = sorted(read_messages.keys())
+        # print 'id_list', id_list
         for message_id in id_list:
             message = read_messages[message_id]
 
+            # message is not a thread header (has a parent_id)
+            # TDE note: parent_id is false is there is a parent we can not see -> ok
+            if message.get('parent_id'):
+                continue
+
             # TDE note: check search is correctly implemented in mail.message
             not_loaded_ids = self.search(cr, uid, [
-                ('parent_id', '=', message['id']),
+                ('id', 'child_of', message['id']),
                 ('id', 'not in', message_loaded_ids),
                 ], context=context, limit=self._message_read_more_limit)
-            # TDE note: avoid using dummy None values, maybe id_min 0, id_max max(list)
-            # group childs not read
-            id_min = None
-            id_max = None
-            nb = 0
+            if not not_loaded_ids:
+                continue
+            # print 'not_loaded_ids', not_loaded_ids
 
+            all_not_loaded_ids += not_loaded_ids
+            # group childs not read
+            id_min, id_max, nb = max(not_loaded_ids), 0, 0
             for not_loaded_id in not_loaded_ids:
                 if not read_messages.get(not_loaded_id):
                     nb += 1
-                    if id_min == None or id_min > not_loaded_id:
+                    if id_min > not_loaded_id:
                         id_min = not_loaded_id
-                    if id_max == None or id_max < not_loaded_id:
+                    if id_max < not_loaded_id:
                         id_max = not_loaded_id
-                    tree_not.append(not_loaded_id)
+                elif nb > 0:
+                    exp_domain = [('id', '>=', id_min), ('id', '<=', id_max), ('id', 'child_of', message_id)]
+                    message_list.append(_get_expandable(exp_domain, nb, message_id, id_min, message.get('model')))
+                    id_min, id_max, nb = max(not_loaded_ids), 0, 0
                 else:
-                    if nb > 0:
-                        message_list.append({
-                            'domain': [('id', '>=', id_min), ('id', '<=', id_max), ('parent_id', '=', message_id)],
-                            'nb_messages': nb,
-                            'type': 'expandable',
-                            'parent_id': message_id,
-                            'id':  id_min,
-                            'model':  message['model']
-                        })
-                    id_min = None
-                    id_max = None
-                    nb = 0
+                    id_min, id_max, nb = max(not_loaded_ids), 0, 0
             if nb > 0:
-                message_list.append({
-                    'domain': [('id', '>=', id_min), ('id', '<=', id_max), ('parent_id', '=', message_id)],
-                    'nb_messages': nb,
-                    'type': 'expandable',
-                    'parent_id': message_id,
-                    'id':  id_min,
-                    'model':  message['model'],
-                })
+                exp_domain = [('id', '>=', id_min), ('id', '<=', id_max), ('id', 'child_of', message_id)]
+                message_list.append(_get_expandable(exp_domain, nb, message_id, id_min, message.get('model')))
 
-        for msg_id in read_messages.keys() + tree_not:
-            message_loaded_ids.append(msg_id)
+        message_loaded_ids = list(set(message_loaded_ids + read_messages.keys() + all_not_loaded_ids))
 
         # expandable for limit max
         ids = self.search(cr, uid, domain + [('id', 'not in', message_loaded_ids)], context=context, limit=1)
-        if len(ids) > 0:
-            message_list.append({
-                'domain': domain,
-                'nb_messages': 0,
-                'type': 'expandable',
-                'parent_id': parent_id,
-                'id': -1,
-            })
+        if ids:
+            message_list.append(_get_expandable(domain, -1, parent_id, -1, None))
 
         return message_list
 
@@ -371,22 +373,25 @@ class mail_message(osv.Model):
         # TDE FIXME: check access rights on search are implemented for mail.message
         # fetch messages according to the domain, add their parents if uid has access to
         ids = self.search(cr, uid, domain, context=context, limit=limit)
+        # print 'message_read ids', ids
         for message in self.read(cr, uid, ids, self._message_read_fields, context=context):
             # if not in tree and not in message_loded list
             if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
                 read_messages[message.get('id')] = message
                 message_list.append(self._message_get_dict(cr, uid, message, context=context))
 
-                # get all parented message if the user have the access
+                # get the older ancestor the user can read
                 parent = self._get_parent(cr, uid, message, context=context)
                 while parent and parent.get('id') != parent_id:
-                    if not read_messages.get(parent.get('id')) and parent.get('id') not in message_unload_ids:
-                        read_messages[parent.get('id')] = parent
-                        message_list.append(self._message_get_dict(cr, uid, parent, context=context))
-                    parent = self._get_parent(cr, uid, parent, context=context)
+                    message = parent
+                    parent = self._get_parent(cr, uid, message, context=context)
+                if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
+                    read_messages[message.get('id')] = message
+                    message_list.append(self._message_get_dict(cr, uid, message, context=context))
 
         # get the child expandable messages for the tree
         message_list = sorted(message_list, key=lambda k: k['id'])
+        # print 'message_read message_list', message_list
         message_list = self._message_read_add_expandables(cr, uid, message_list, read_messages,
             message_loaded_ids=message_unload_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
 
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 016a392f9dc..55f50fd720c 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -123,6 +123,7 @@ class test_mail(TestMailMockups):
 
     def setUp(self):
         super(test_mail, self).setUp()
+        cr, uid = self.cr, self.uid
         self.ir_model = self.registry('ir.model')
         self.mail_alias = self.registry('mail.alias')
         self.mail_thread = self.registry('mail.thread')
@@ -135,22 +136,25 @@ class test_mail(TestMailMockups):
         self.res_users = self.registry('res.users')
         self.res_partner = self.registry('res.partner')
 
+        # Find Employee group
+        group_employee_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        group_employee_id = group_employee_ref and group_employee_ref[1] or False
         # Test users
-        self.user_demo_id = self.registry('ir.model.data').get_object_reference(self.cr, self.uid, 'base', 'user_demo')[1]
-        self.user_admin = self.res_users.browse(self.cr, self.uid, self.uid)
+        self.user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul', 'groups_id': [(6, 0, [group_employee_id])]})
+        self.user_admin = self.res_users.browse(cr, uid, uid)
 
         # Mock send_get_mail_body to test its functionality without other addons override
         self._send_get_mail_body = self.registry('mail.mail').send_get_mail_body
         self.registry('mail.mail').send_get_mail_body = self._mock_send_get_mail_body
 
         # groups@.. will cause the creation of new mail groups
-        self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model', '=', 'mail.group')])[0]
-        self.mail_alias.create(self.cr, self.uid, {'alias_name': 'groups',
+        self.mail_group_model_id = self.ir_model.search(cr, uid, [('model', '=', 'mail.group')])[0]
+        self.mail_alias.create(cr, uid, {'alias_name': 'groups',
                                                    'alias_model_id': self.mail_group_model_id})
         # create a 'pigs' group that will be used through the various tests
-        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+        self.group_pigs_id = self.mail_group.create(cr, uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
-        self.group_pigs = self.mail_group.browse(self.cr, self.uid, self.group_pigs_id)
+        self.group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
 
     def tearDown(self):
         # Remove mocks
@@ -260,7 +264,7 @@ class test_mail(TestMailMockups):
         """ Tests designed for the subscriber API as well as message subtypes """
         cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
         # Data: user Raoul
-        user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul'})
+        user_raoul_id = self.user_raoul_id
         user_raoul = self.res_users.browse(cr, uid, user_raoul_id)
         # Data: message subtypes
         self.mail_message_subtype.create(cr, uid, {'name': 'mt_mg_def', 'default': True, 'res_model': 'mail.group'})
@@ -523,29 +527,61 @@ class test_mail(TestMailMockups):
     def test_30_message_read(self):
         """ Tests for message_read and expandables. """
         cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        pigs_domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]
 
-        # Data: create a discussion in Pigs
-        msg_ids = []
-        for dummy in range(5):
-            msg_ids.append(self.group_pigs.message_post(body='My Body', subtype='mt_comment'))
+        # Data: create a discussion in Pigs (2 messages, one with 2 and one with 3 answers)
+        msg_id1 = self.group_pigs.message_post(body='1', subtype='mt_comment')
+        msg_id2 = self.group_pigs.message_post(body='2', subtype='mt_comment')
+        msg_id3 = self.group_pigs.message_post(body='1-1', subtype='mt_comment', parent_id=msg_id1)
+        msg_id4 = self.group_pigs.message_post(body='2-1', subtype='mt_comment', parent_id=msg_id2)
+        msg_id5 = self.group_pigs.message_post(body='1-2', subtype='mt_comment', parent_id=msg_id1)
+        msg_id6 = self.group_pigs.message_post(body='2-2', subtype='mt_comment', parent_id=msg_id2)
+        msg_id7 = self.group_pigs.message_post(body='1-1-1', subtype='mt_comment', parent_id=msg_id3)
+        msg_id8 = self.group_pigs.message_post(body='2-1-1', subtype='mt_comment', parent_id=msg_id4)
+        msg_id9 = self.group_pigs.message_post(body='1-1-1', subtype='mt_comment', parent_id=msg_id3)
+        msg_id10 = self.group_pigs.message_post(body='2-1-1', subtype='mt_comment', parent_id=msg_id4)
+        msg_ids = [msg_id1, msg_id2, msg_id3, msg_id4, msg_id5, msg_id6, msg_id7, msg_id8, msg_id9, msg_id10]
 
         # Test: read some specific ids
-        read_msg_list = self.mail_message.message_read(cr, uid, ids=msg_ids[1:3], domain=[('body', 'like', 'dummy')])
+        read_msg_list = self.mail_message.message_read(cr, uid, ids=msg_ids[2:4], domain=[('body', 'like', 'dummy')])
         read_msg_ids = [msg.get('id') for msg in read_msg_list]
-        self.assertEqual(msg_ids[1:3], read_msg_ids, 'message_read with direct ids should read only the requested ids')
+        self.assertEqual(msg_ids[2:4], read_msg_ids, 'message_read with direct ids should read only the requested ids')
 
         # Test: read messages of Pigs through a domain
-        read_msg_list = self.mail_message.message_read(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=200)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=200)
         read_msg_ids = [msg.get('id') for msg in read_msg_list]
         self.assertEqual(msg_ids, read_msg_ids, 'message_read with domain on Pigs should equal all messages of Pigs')
 
+        # Test: read last message, check expandables
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: parent is added to the read messages
+        self.assertEqual(set([msg_id2, msg_id10]), set(read_msg_ids), 'message_read on the last Pigs message should also get its parent')
+        print read_msg_ids
+        # Test: expandables
+        # 1. expandable for childs of Body2 before the last reply
+        # 2. expandable for messages before Body2
+        for msg in read_msg_list:
+            if msg.get('type') == 'expandable':
+                print msg
+            # 'read more threads' expandable
+            if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('id') == -1:
+                domain = msg.get('domain', [])
+                self.assertEqual(set(domain), set(pigs_domain), 'general expandable domain should equal the message_read domain parameter')
+            # 'read more messages' expandables
+            elif msg.get('type') == 'expandable':
+                domain = msg.get('domain', [])
+                self.assertIn(('id', 'child_of', msg_id2), domain, 'thread expandable domain should contain a child_of condition')
+                self.assertIn(('id', '>=', msg_id4), domain, 'thread expandable domain should contain a child_of condition')
+                self.assertIn(('id', '<=', msg_id8), domain, 'thread expandable domain should contain a child_of condition')
+
     def test_40_needaction(self):
         """ Tests for mail.message needaction. """
         cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
-        user_demo = self.res_users.browse(cr, uid, self.user_demo_id)
-        group_pigs_demo = self.mail_group.browse(cr, self.user_demo_id, self.group_pigs_id)
+        user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
+        group_pigs_demo = self.mail_group.browse(cr, self.user_raoul_id, self.group_pigs_id)
         na_admin_base = self.mail_message._needaction_count(cr, uid, domain=[])
-        na_demo_base = self.mail_message._needaction_count(cr, user_demo.id, domain=[])
+        na_demo_base = self.mail_message._needaction_count(cr, user_raoul.id, domain=[])
 
         # Test: number of unread notification = needaction on mail.message
         notif_ids = self.mail_notification.search(cr, uid, [
@@ -573,12 +609,12 @@ class test_mail(TestMailMockups):
         self.assertEqual(na_admin_group, 3, 'Admin should have 3 needaction related to Pigs')
         # Test: demo has 0 new notifications (not a follower, not receiving its own messages), and 0 new needaction
         notif_ids = self.mail_notification.search(cr, uid, [
-            ('partner_id', '=', user_demo.partner_id.id),
+            ('partner_id', '=', user_raoul.partner_id.id),
             ('read', '=', False)
             ])
         self.assertEqual(len(notif_ids), na_demo_base + 0, 'Demo should have 0 new unread notifications')
-        na_demo = self.mail_message._needaction_count(cr, user_demo.id, domain=[])
-        na_demo_group = self.mail_message._needaction_count(cr, user_demo.id, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+        na_demo = self.mail_message._needaction_count(cr, user_raoul.id, domain=[])
+        na_demo_group = self.mail_message._needaction_count(cr, user_raoul.id, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
         self.assertEqual(na_demo, na_demo_base + 0, 'Demo should have 0 new needaction')
         self.assertEqual(na_demo_group, 0, 'Demo should have 0 needaction related to Pigs')
 
@@ -599,6 +635,9 @@ class test_mail(TestMailMockups):
         # TDE note: temp various asserts because of the random bug about msg1.child_ids
         msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=1)
         new_msg = self.mail_message.browse(cr, uid, msg_ids[0])
+        if new_msg.parent_id.id != msg1.id:
+            import pdb
+            pdb.set_trace()
         self.assertEqual(new_msg.parent_id, msg1, 'Newly processed mail_message (%d) should have msg1 as parent (msg2 is %d)' % (new_msg.id, msg2.id))
 
         # 2. References header

From 57039657e49644e950881598c2a0c949d19cf26b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 23 Oct 2012 09:42:42 +0200
Subject: [PATCH 042/106] [IMP] mail: get message_ids list on the current model

bzr revid: chm@openerp.com-20121023074242-u43ibl6bvfp31st6
---
 addons/mail/static/src/js/mail.js   | 34 +++++++++++++++--------------
 addons/mail/static/src/xml/mail.xml |  1 +
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index bbf68f7711c..ff2c2f0b934 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -304,7 +304,7 @@ openerp.mail = function(session) {
                 this.$render_expandable.on('blur', 'textarea', this.on_compose_expandable);
 
                 /* stack for don't close the compose form if the user click on a button */
-                this.$render_expandable.on('focus', 'textarea', function () { self.stay_open = false; });
+                this.$render_expandable.on('focus, mouseup', 'textarea', function () { self.stay_open = false; });
                 this.$render_expandable.on('mousedown', function () { self.stay_open = true; });
             }
         },
@@ -847,7 +847,6 @@ openerp.mail = function(session) {
          * add or remove a favorite (or starred) for a message and change class on the DOM
         */
         on_star: function (event) {
-            console.log('on_star');
             event.stopPropagation();
             var self=this;
             var button = self.$('.oe_star:first');
@@ -1170,14 +1169,8 @@ openerp.mail = function(session) {
 
             // check if the message is already create
             for(var i in self.messages){
-                if(self.messages[i].id == message.id){
+                if(self.messages[i] && self.messages[i].id == message.id){
                     self.messages[i].destroy();
-                    if(message.id>0){
-                        self.messages[i] = message;
-                        return true;
-                    } else {
-                        delete self.messages[i];
-                    }
                 }
             }
             self.messages.push( message );
@@ -1288,6 +1281,10 @@ openerp.mail = function(session) {
             });
         },
 
+        /**
+         * this method is call when the widget of a message or an expandable message is destroy
+         * in this thread. The this.messages array is filter to remove this message
+         */
         on_message_detroy: function (message) {
 
             this.messages = _.filter(this.messages, function (val) { return !val.isDestroyed(); });
@@ -1410,6 +1407,8 @@ openerp.mail = function(session) {
          *...  @param {Boolean} [show_compose_message] allow to display the composer
          *...  @param {Boolean} [show_compact_message] display the compact message on the thread
          *      when the user clic on this compact mode, the composer is open
+         *...  @param {Array} [message_ids] List of ids to fetch by the root thread.
+         *      When you use this option, the domain is not used for the fetch root.
          */
         init: function (parent, options) {
             this._super(parent);
@@ -1425,7 +1424,8 @@ openerp.mail = function(session) {
                 'truncate_limit' : 250,
                 'show_record_name' : false,
                 'show_compose_message' : false,
-                'show_compact_message' : false 
+                'show_compact_message' : false,
+                'message_ids': []
             }, options);
 
             if(this.display_indented_thread === false) {
@@ -1462,9 +1462,9 @@ openerp.mail = function(session) {
 
             this.thread.appendTo( this.$el );
             this.thread.no_message();
-            this.thread.message_fetch();
+            this.thread.message_fetch(null, null, this.options.message_ids);
 
-            if(this.options.show_compose_message && this.thread.ComposeMessage){
+            if(this.options.show_compose_message){
                 this.thread.ComposeMessage.do_show_compact();
             }
         },
@@ -1522,10 +1522,11 @@ openerp.mail = function(session) {
             // update domain
             var domain = this.options.domain.concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]);
 
-            // TDE note: replace message_is_follower by a check in message_follower_ids, as message_is_follower is not used in views anymore
             var show_compose_message = this.view.is_action_enabled('edit') ||
                 (this.getParent().fields.message_is_follower && this.getParent().fields.message_is_follower.get_value());
 
+            var message_ids = this.getParent().fields.message_ids && this.getParent().fields.message_ids.get_value();
+
             if(this.root){
                 this.root.destroy();
             }
@@ -1537,7 +1538,8 @@ openerp.mail = function(session) {
                 'display_indented_thread': -1,
                 'show_reply_button': 0,
                 'show_read_unread_button': -1,
-                'show_compose_message': show_compose_message
+                'show_compose_message': show_compose_message,
+                'message_ids': message_ids
                 }
             );
 
@@ -1631,11 +1633,11 @@ openerp.mail = function(session) {
                 'domain' : domain,
                 'context' : context,
                 'typeof_thread': context['typeof_thread'] || 'other',
-                'display_indented_thread': 2,
+                'display_indented_thread': 1,
                 'show_reply_button': 10,
                 'show_read_unread_button': 11,
                 'show_compose_message': true,
-                'show_compact_message': true
+                'show_compact_message': false
                 }
             );
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1d5f3a9e239..a361daae154 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -145,6 +145,7 @@
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message
                     </button>
+                    or
                     <button type="button" class="oe_write_onwall" help="Your followers can read this message">
                         Write to your followers
                     </button>

From 7c789f5efa53fb82e4ee71c54b729e798b3bc5af Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 23 Oct 2012 10:47:36 +0200
Subject: [PATCH 043/106] [IMP] mail: add on js an option for the py:
 nb_indented_thread

bzr revid: chm@openerp.com-20121023084736-314ul6edkplqxxb7
---
 addons/mail/static/src/js/mail.js | 51 ++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ff2c2f0b934..025e5d43b9a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -145,6 +145,8 @@ openerp.mail = function(session) {
             this.context = options.context || {};
             this.options = options.options;
 
+            this.show_compact_message = this.options.show_compact_message || false;
+
             // data of this compose message
             this.attachment_ids = [];
             this.id = datasets.id;
@@ -168,6 +170,12 @@ openerp.mail = function(session) {
         start: function(){
             this.$render_compact = this.$el;
 
+            if( this.options.show_compact_message ) {
+                this.$render_compact.show();
+            } else {
+                this.$render_compact.hide();
+            }
+
             this.bind_events();
         },
 
@@ -395,13 +403,9 @@ openerp.mail = function(session) {
             }
         },
 
-        /* convert the compact mode into the compose message
+        /* create the compose on expandable form
         */
-        on_compose_expandable: function(event){
-            if(event) event.stopPropagation();
-
-            var self = this;
-
+        instantiate_expandable: function() {
             if(!this.$render_expandable) {
                 this.$render_expandable = $(session.web.qweb.render('mail.compose_message', {'widget': this}));
                 this.$render_expandable.hide();
@@ -411,6 +415,16 @@ openerp.mail = function(session) {
 
                 this.bind_events();
             }
+        },
+
+        /* convert the compact mode into the compose message
+        */
+        on_compose_expandable: function(event){
+            if(event) event.stopPropagation();
+
+            var self = this;
+
+            this.instantiate_expandable();
 
             if(this.$render_expandable.is(':hidden')){
 
@@ -423,7 +437,7 @@ openerp.mail = function(session) {
                 // do not close the box if there are some text
                 if(!this.$render_expandable.find('textarea').val().match(/\S+/)){
                     this.$render_expandable.hide();
-                    if(this.options.show_compact_message) {
+                    if(this.options.show_compact_message && this.show_compact_message) {
                         this.$render_compact.show();
                     } else {
                         this.$render_compact.hide();
@@ -436,14 +450,14 @@ openerp.mail = function(session) {
 
         do_hide_compact: function() {
             this.$render_compact.hide();
-            this.options.show_compact_message = false;
+            this.show_compact_message = false;
         },
 
         do_show_compact: function() {
-            if(!this.$render_expandable || this.$render_expandable.is(':hidden')){
+            if(this.options.show_compact_message && (!this.$render_expandable || this.$render_expandable.is(':hidden'))) {
                 this.$render_compact.show();
             }
-            this.options.show_compact_message = true;
+            this.show_compact_message = true;
         }
     });
 
@@ -1132,7 +1146,10 @@ openerp.mail = function(session) {
             fetch_context = replace_context ? replace_context : this.context;
             var message_loaded_ids = this.id ? [this.id].concat( self.get_child_ids() ) : self.get_child_ids();
 
-            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, fetch_context, this.context.default_parent_id || undefined]
+            // CHM note : option for sending in flat mode by server
+            var nb_indented_thread = this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0;
+
+            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, /*nb_indented_thread,*/ fetch_context, this.context.default_parent_id || undefined]
                 ).then(this.proxy('switch_new_message'));
         },
 
@@ -1189,7 +1206,7 @@ openerp.mail = function(session) {
             var self=this;
 
             if(this.show_compose_message && 
-                this.options.display_indented_thread > self.thread_level){
+                this.options.display_indented_thread >= self.thread_level){
                 this.ComposeMessage.do_show_compact();
             }
 
@@ -1464,8 +1481,12 @@ openerp.mail = function(session) {
             this.thread.no_message();
             this.thread.message_fetch(null, null, this.options.message_ids);
 
-            if(this.options.show_compose_message){
-                this.thread.ComposeMessage.do_show_compact();
+            if(this.options.show_compose_message) {
+                if(this.options.show_compact_message) {
+                    this.thread.ComposeMessage.do_show_compact();
+                } else {
+                    this.thread.ComposeMessage.do_hide_compact();
+                }
             }
         },
 
@@ -1637,7 +1658,7 @@ openerp.mail = function(session) {
                 'show_reply_button': 10,
                 'show_read_unread_button': 11,
                 'show_compose_message': true,
-                'show_compact_message': false
+                'show_compact_message': true
                 }
             );
 

From b37b348107e48f3eb7e23a95af50217d1ed25d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Oct 2012 11:03:38 +0200
Subject: [PATCH 044/106] [OUCH] Removed a pdb.

bzr revid: tde@openerp.com-20121023090338-2vefi0yee077q2ne
---
 addons/mail/tests/test_mail.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 55f50fd720c..9fdabca315c 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -635,9 +635,9 @@ class test_mail(TestMailMockups):
         # TDE note: temp various asserts because of the random bug about msg1.child_ids
         msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=1)
         new_msg = self.mail_message.browse(cr, uid, msg_ids[0])
-        if new_msg.parent_id.id != msg1.id:
-            import pdb
-            pdb.set_trace()
+        # if new_msg.parent_id.id != msg1.id:
+        #     import pdb
+        #     pdb.set_trace()
         self.assertEqual(new_msg.parent_id, msg1, 'Newly processed mail_message (%d) should have msg1 as parent (msg2 is %d)' % (new_msg.id, msg2.id))
 
         # 2. References header

From 1e543551be1323470901121f8186bdf126ed4621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 23 Oct 2012 11:32:35 +0200
Subject: [PATCH 045/106] [IMP] mail: moved buttons around, styled the
 more-message button

bzr revid: fva@openerp.com-20121023093235-s1y9903oxvhu89c4
---
 addons/mail/static/src/css/mail.css | 41 +++++++++++++++++++----------
 addons/mail/static/src/xml/mail.xml |  7 ++---
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 276c9d28a15..f4dd52c4ca4 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -22,18 +22,18 @@
     margin-bottom: 2px;
     min-height: 40px;
 }
-.openerp .oe_mail .oe_msg:not(.oe_lvl_0){
+.openerp .oe_mail .oe_msg_indented{
     background: #FFF;
     border: none;
     margin-bottom:0px;
     min-height:34px;
 }
-.openerp .oe_mail .oe_msg:not(.oe_lvl_0) .oe_msg_icon{
+.openerp .oe_mail .oe_msg_indented .oe_msg_icon{
     width:32px;
     margin:1px;
     border-radius:2px;
 }
-.openerp .oe_mail .oe_msg:not(.oe_lvl_0) .oe_msg_center{
+.openerp .oe_mail .oe_msg_indented .oe_msg_center{
     margin-left:34px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_left{
@@ -56,11 +56,11 @@
     padding-left: 4px;
     overflow: hidden;
     font-size: 11px;
-    opacity:0;
+    opacity:0.8;
     -webkit-transition: opacity 0.2s linear;
 }
 .openerp .oe_mail .oe_thread:hover .oe_msg_footer{
-    opacity: 0.8;
+    opacity: 1;
     -webkit-transition: opacity 0.2s linear;
 }
 .openerp .oe_mail .oe_msg.oe_msg_composer .oe_msg_footer{
@@ -76,6 +76,7 @@
     float: right;
     margin-top: 4px;
     margin-right: 8px;
+    margin-left: 8px;
     height: 24px;
     -webkit-user-select: none;
 }
@@ -88,9 +89,8 @@
 }
 .openerp .oe_mail .oe_msg .oe_msg_icons a {
     text-decoration: none;
-    /*opacity: 0.2;*/
     color: #FFF;
-    text-shadow: 0px 1px #AAA,0px -1px #AAA, -1px 0px #AAA, 1px 0px #AAA, 0px 3px 3px rgba(0,0,0,0.2);
+    text-shadow: 0px 1px #AAA,0px -1px #AAA, -1px 0px #AAA, 1px 0px #AAA, 0px 3px 3px rgba(0,0,0,0.1);
     -webkit-transition: all 0.2s linear;
 }
 .openerp .oe_mail .oe_msg:hover .oe_msg_icons a{
@@ -99,23 +99,23 @@
 }
 .openerp .oe_mail .oe_msg .oe_msg_icons .oe_star:hover a{
     color: #FFF6C0;
-    text-shadow: 0px 1px #FFA162,0px -1px #FFA162, -1px 0px #FFA162, 1px 0px #FFA162, 0px 3px 3px rgba(0,0,0,0.2);
+    text-shadow: 0px 1px #FFA162,0px -1px #FFA162, -1px 0px #FFA162, 1px 0px #FFA162, 0px 3px 3px rgba(0,0,0,0.1);
 }
 .openerp .oe_mail .oe_msg .oe_msg_icons .oe_star.oe_starred a{
     color: #FFE41F;
-    text-shadow: 0px 1px #DF6200,0px -1px #DF6200, -1px 0px #DF6200, 1px 0px #DF6200, 0px 3px 3px rgba(0,0,0,0.2);
+    text-shadow: 0px 1px #DF6200,0px -1px #DF6200, -1px 0px #DF6200, 1px 0px #DF6200, 0px 3px 3px rgba(0,0,0,0.1);
 }
 .openerp .oe_mail .oe_msg .oe_msg_icons .oe_reply:hover a{
     color: #1fc0ff;
-    text-shadow: 0px 1px #184fc5,0px -1px #184fc5, -1px 0px #184fc5, 1px 0px #184fc5, 0px 3px 3px rgba(0,0,0,0.2);
+    text-shadow: 0px 1px #184fc5,0px -1px #184fc5, -1px 0px #184fc5, 1px 0px #184fc5, 0px 3px 3px rgba(0,0,0,0.1);
 }
 .openerp .oe_mail .oe_msg .oe_msg_icons .oe_read:hover a{
-    color: #f3ffcd;
-    text-shadow: 0px 1px #59EB99,0px -1px #59EB99, -1px 0px #59EB99, 1px 0px #59EB99, 0px 3px 3px rgba(0, 0, 0, 0.2);
+    color: #bbbaff;
+    text-shadow: 0px 1px #7c7bad,0px -1px #7c7bad, -1px 0px #7c7bad, 1px 0px #7c7bad, 0px 3px 3px rgba(0,0,0,0.1);
 }
-.openerp .oe_mail .oe_msg .oe_msg_icons .oe_unread a{
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_unread:hover a{
     color: #c2ff00;
-    text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.2);
+    text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.1);
 }
 .openerp .oe_mail .oe_msg .oe_msg_content textarea{
     width: 100%;
@@ -139,3 +139,16 @@
 .openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
     display:none;
 }
+
+/* ---------------- HIDDEN MESSAGES ------------------ */
+
+.openerp .oe_mail .oe_msg_content.oe_msg_more_message{
+    text-align: right;
+    padding-right: 300px;
+    opacity: 0.5;
+    -webkit-transition: opacity 0.2s linear;
+}
+.openerp .oe_mail .oe_msg_more_message:hover{
+    opacity: 1;
+    -webkit-transition: opacity 0.2s linear;
+}
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1d5f3a9e239..2ade728426e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -194,8 +194,8 @@
 
             <div class="oe_msg_center">
                 <div class='oe_msg_icons'>
-                    <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
-                    <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Set back to unread" class="oe_e">W</a></span>
+                    <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Read" class="oe_e">X</a></span>
+                    <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Set back to unread" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
                     <span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Add To Favorites" class="oe_e">7</a></span>
                 </div>
@@ -231,7 +231,8 @@
     <t t-name="mail.thread.expandable">
         <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
             <div class="oe_msg_content oe_msg_more_message">
-                <a class="oe_msg_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
+                <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">load one more message</a>
+                <a t-if="widget.nb_messages !== 1" class="oe_msg_fetch_more">load <t t-raw="widget.nb_messages" /> more messages</a>
             </div>
         </div>
     </t>

From 5e839a72de59497140a98e489acbd19cfc978233 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 23 Oct 2012 13:38:42 +0200
Subject: [PATCH 046/106] [IMP] mail: convert parent_id to ancestor_id in js
 side

bzr revid: chm@openerp.com-20121023113842-0c9rh3dvr205p7uz
---
 addons/mail/static/src/js/mail.js | 105 ++++++++++++++++--------------
 1 file changed, 55 insertions(+), 50 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 025e5d43b9a..4cf17218a4c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -342,7 +342,7 @@ openerp.mail = function(session) {
                     'default_model': this.context.default_model,
                     'default_res_id': this.context.default_res_id,
                     'default_content_subtype': 'html',
-                    'default_parent_id': this.id,
+                    'default_ancestor_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
                     'default_attachment_ids': attachments,
                     'default_partner_ids': partner_ids
@@ -390,13 +390,12 @@ openerp.mail = function(session) {
                         false, 
                         'comment', 
                         'mail.mt_comment',
-                        this.context.default_parent_id, 
+                        this.context.default_ancestor_id, 
                         attachments,
                         this.parent_thread.context
                     ]).then(function(records){
                         self.parent_thread.switch_new_message(records);
                         self.on_cancel();
-                        self.do_show_compact();
                         //session.web.unblockUI();
                     });
                 return true;
@@ -483,12 +482,12 @@ openerp.mail = function(session) {
             this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id: 0,
-                default_parent_id: false }, options.context || {});
+                default_ancestor_id: false }, options.context || {});
 
             // data of this expandable message
             this.id = datasets.id || -1,
             this.model = datasets.model || false,
-            this.parent_id = datasets.parent_id || false,
+            this.ancestor_id = datasets.ancestor_id || false,
             this.nb_messages = datasets.nb_messages || 0,
             this.thread_level = datasets.thread_level || 0,
             this.type = 'expandable',
@@ -567,10 +566,10 @@ openerp.mail = function(session) {
      * - record.attachment_ids[].url: url of each attachmentThe
      * thread view :
      * - root thread
-     * - - sub message (parent_id = root message)
+     * - - sub message (ancestor_id = root message)
      * - - - sub thread
      * - - - - sub sub message (parent id = sub thread)
-     * - - sub message (parent_id = root message)
+     * - - sub message (ancestor_id = root message)
      * - - - sub thread
      */
     mail.ThreadMessage = session.web.Widget.extend({
@@ -598,7 +597,7 @@ openerp.mail = function(session) {
             // data of this message
             this.id = datasets.id ||  -1,
             this.model = datasets.model ||  false,
-            this.parent_id = datasets.parent_id ||  false,
+            this.ancestor_id = datasets.ancestor_id ||  false,
             this.res_id = datasets.res_id ||  false,
             this.type = datasets.type ||  false,
             this.is_author = datasets.is_author ||  false,
@@ -621,7 +620,7 @@ openerp.mail = function(session) {
             this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id: 0,
-                default_parent_id: false }, options.context || {});
+                default_ancestor_id: false }, options.context || {});
 
             // record options
             this.options = options.options;
@@ -728,7 +727,7 @@ openerp.mail = function(session) {
                     'context':{
                         'default_model': this.model,
                         'default_res_id': this.res_id,
-                        'default_parent_id': this.id
+                        'default_ancestor_id': this.id
                     },
                     'options': this.options
                 }
@@ -898,10 +897,10 @@ openerp.mail = function(session) {
      * This widget handles the display of a thread of messages. The
      * thread view:
      * - root thread
-     * - - sub message (parent_id = root message)
+     * - - sub message (ancestor_id = root message)
      * - - - sub thread
      * - - - - sub sub message (parent id = sub thread)
-     * - - sub message (parent_id = root message)
+     * - - sub message (ancestor_id = root message)
      * - - - sub thread
      */
     mail.Thread = session.web.Widget.extend({
@@ -930,7 +929,7 @@ openerp.mail = function(session) {
             this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id: 0,
-                default_parent_id: false }, options.context || {});
+                default_ancestor_id: false }, options.context || {});
 
             this.options = options.options;
             this.options._parents = (options.options._parents != undefined ? options.options._parents : []).concat( [this] );
@@ -941,7 +940,7 @@ openerp.mail = function(session) {
             // data of this thread
             this.id =  datasets.id || false,
             this.model =  datasets.model || false,
-            this.parent_id =  datasets.parent_id || false,
+            this.ancestor_id =  datasets.ancestor_id || false,
             this.is_private =  datasets.is_private || false,
             this.author_id =  datasets.author_id || false,
             this.thread_level =  (datasets.thread_level+1) || 0,
@@ -1048,8 +1047,8 @@ openerp.mail = function(session) {
             if(arguments[1]) res.push(this);
             if(isNaN(nb_thread_level) || nb_thread_level>0){
                 _(this.messages).each(function (val, key) {
-                    if(val.thread){
-                        res = res.concat( val.thread.get_childs((isNaN(nb_thread_level) ? null : nb_thread_level-1), true) ) 
+                    if(val.thread) {
+                        res = res.concat( val.thread.get_childs((isNaN(nb_thread_level) ? undefined : nb_thread_level-1), true) );
                     }
                 });
             }
@@ -1149,7 +1148,7 @@ openerp.mail = function(session) {
             // CHM note : option for sending in flat mode by server
             var nb_indented_thread = this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0;
 
-            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, /*nb_indented_thread,*/ fetch_context, this.context.default_parent_id || undefined]
+            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, /*nb_indented_thread,*/ fetch_context, this.context.default_ancestor_id || undefined]
                 ).then(this.proxy('switch_new_message'));
         },
 
@@ -1168,16 +1167,16 @@ openerp.mail = function(session) {
                     'context': {
                         'default_model': data.model || self.context.default_model,
                         'default_res_id': data.res_id || self.context.default_res_id,
-                        'default_parent_id': self.id },
+                        'default_ancestor_id': self.id },
                 });
             } else {
-                var message = new mail.ThreadMessage(self, _.extend(data, {'thread_level': self.thread_level}), {
+                var message = new mail.ThreadMessage(self, _.extend(data, {'thread_level': data.thread_level ? data.thread_level : self.thread_level}), {
                     'domain': data.domain,
                     'context': {
                         'default_model': data.model,
                         'default_res_id': data.res_id,
-                        'default_parent_id': data.id },
-                    'options': self.options
+                        'default_ancestor_id': data.id },
+                    'options': _.extend(self.options, data.options)
                 });
             }
 
@@ -1205,34 +1204,25 @@ openerp.mail = function(session) {
         insert_message: function (message) {
             var self=this;
 
-            if(this.show_compose_message && 
-                this.options.display_indented_thread >= self.thread_level){
+            if(this.show_compose_message /*&& 
+                this.options.display_indented_thread >= self.thread_level*/){
                 this.ComposeMessage.do_show_compact();
             }
 
             this.$('.oe_wall_no_message').remove();
 
-            // insert on hierarchy display => insert in self child
-            var thread_messages = self.messages;
-            var thread = self;
-            if( self.options.display_indented_thread < self.thread_level ) {
-                var thread =  self.options._parents[self.options.display_indented_thread] || self.options._parents[0];
-                var thread_messages = [];
-                _(thread.get_childs()).each(function (val, key) { thread_messages.push(val.parent_message); });
-            }
-
             // check older and newer message for insertion
             var parent_newer = false;
             var parent_older = false;
             if(message.id > 0){
-                for(var i in thread_messages){
-                    if(thread_messages[i].id > message.id){
-                        if(!parent_newer || parent_newer.id > thread_messages[i].id) {
-                            parent_newer = thread_messages[i];
+                for(var i in self.messages){
+                    if(self.messages[i].id > message.id){
+                        if(!parent_newer || parent_newer.id > self.messages[i].id) {
+                            parent_newer = self.messages[i];
                         }
-                    } else if(thread_messages[i].id > 0 && thread_messages[i].id < message.id) {
-                        if(!parent_older || parent_older.id < thread_messages[i].id) {
-                            parent_older = thread_messages[i];
+                    } else if(self.messages[i].id > 0 && self.messages[i].id < message.id) {
+                        if(!parent_older || parent_older.id < self.messages[i].id) {
+                            parent_older = self.messages[i];
                         }
                     }
                 }
@@ -1253,11 +1243,11 @@ openerp.mail = function(session) {
 
                 } else if(message.id < 0) {
 
-                    message.appendTo(thread.$el);
+                    message.appendTo(self.$el);
 
                 } else {
 
-                    message.prependTo(thread.$el);
+                    message.prependTo(self.$el);
                 }
             } else {
                 if (parent_older) {
@@ -1271,11 +1261,11 @@ openerp.mail = function(session) {
 
                 } else if(message.id < 0) {
 
-                    message.prependTo(thread.$el);
+                    message.prependTo(self.$el);
 
                 } else {
 
-                    message.appendTo(thread.$el);
+                    message.appendTo(self.$el);
 
                 }
             }
@@ -1285,16 +1275,31 @@ openerp.mail = function(session) {
         
         /**
          *get the parent thread of the messages.
-         * Each message is send to his parent object for creating the object message.
+         * Each message is send to his parent object (or parent thread flat mode) for creating the object message.
          * @param : {Array} datas from calling RPC to "message_read"
          */
         switch_new_message: function(records) {
             var self=this;
             _(records).each(function(record){
-                self.browse_thread({
-                    'id': record.parent_id, 
+                var thread = self.browse_thread({
+                    'id': record.ancestor_id, 
                     'default_return_top_thread':true
-                }).create_message_object( record );
+                });
+
+                /*
+                record.thread_level = thread.thread_level;
+                record.options = {'_parents' : thread.options._parents };
+
+                // check for flat mode
+                var nb_level = thread.options.display_indented_thread - thread.thread_level;
+
+                if(nb_level <= 0){
+                    var thread = thread.options._parents[ thread.options._parents.length - 1 + nb_level ];
+                }
+                */
+
+
+                thread.create_message_object( record );
             });
         },
 
@@ -1324,7 +1329,7 @@ openerp.mail = function(session) {
             var msg_up = messages[it-1];
             var msg_down = messages[it+1];
 
-            var message_dom = [ '&', ["id","in",[message.id]], ['parent_id', '=', message.parent_id] ];
+            var message_dom = [ ["id", "=", message.id] ];
 
             if ( msg_up && msg_up.type == "expandable" && msg_down && msg_down.type == "expandable") {
                 // concat two expandable message and add this message to this dom
@@ -1368,7 +1373,7 @@ openerp.mail = function(session) {
                 var expandable = new mail.ThreadExpandable(this, {
                     'id': message.id,
                     'model': message.model,
-                    'parent_id': message.parent_id,
+                    'ancestor_id': message.ancestor_id,
                     'nb_messages': 1,
                     'thread_level': message.thread_level,
                     }, {
@@ -1376,7 +1381,7 @@ openerp.mail = function(session) {
                     'context': {
                         'default_model': message.model || this.context.default_model,
                         'default_res_id': message.res_id || this.context.default_res_id,
-                        'default_parent_id': this.id },
+                        'default_ancestor_id': this.id },
                 });
 
                 // add object on array and DOM

From 8c8c0dd75325ffae7b2fc70a12a69dd12008bee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Oct 2012 13:41:24 +0200
Subject: [PATCH 047/106] [IMP] mail: message_read: improved flat / threaded
 domains (using child_of for thread, or only id for flat); improved ancestor
 fetching (not using parent_id anymore, because ancestor is the parent message
 to display the message thread).

bzr revid: tde@openerp.com-20121023114124-co3ij97tz1c25qa8
---
 addons/mail/mail_message.py       | 71 ++++++++++++++++++++-----------
 addons/mail/static/src/js/mail.js |  2 +-
 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 1a650e8f67d..6f6a838533b 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -240,7 +240,7 @@ class mail_message(osv.Model):
             'is_author': is_author,
             # TDE note: is this useful ? to check
             'partner_ids': partner_ids,
-            'parent_id': message['parent_id'] and message['parent_id'][0] or False,
+            'ancestor_id': False,
             'vote_nb': len(message['vote_user_ids']),
             'has_voted': has_voted,
             'is_private': is_private,
@@ -249,14 +249,26 @@ class mail_message(osv.Model):
         }
 
     def _message_read_add_expandables(self, cr, uid, message_list, read_messages,
-            message_loaded_ids=[], domain=[], context=None, parent_id=False, limit=None):
-        """ Create the expandable message for all parent message read
-            this function is used by message_read
+            thread_level=0, message_loaded_ids=[], domain=[], parent_id=False, context=None, limit=None):
+        """ Create expandables for message_read, to load new messages.
+            1. get the expandable for new threads
+                if display is flat (thread_level == 0):
+                    fetch message_ids < min(already displayed ids), because we
+                    want a flat display, ordered by id
+                else:
+                    fetch message_ids that are not childs of already displayed
+                    messages
+            2. get the expandables for new messages inside threads if display
+               is not flat
+                for each thread header, search for its childs
+                    for each hole in the child list based on message displayed,
+                    create an expandable
 
-            :param list message_list: list of messages given by message_read to
-                which we have to add expandables
+            :param list message_list:list of message structure for the Chatter
+                widget to which expandables are added
             :param dict read_messages: dict [id]: read result of the messages to
                 easily have access to their values, given their ID
+            :return bool: True
         """
         def _get_expandable(domain, message_nb, parent_id, id, model):
             return {
@@ -268,10 +280,22 @@ class mail_message(osv.Model):
                 # TDE note: why do we need model sometimes, and sometimes not ???
                 'model': model,
             }
-        all_not_loaded_ids = []
-        # expandable for not show message
+
+        # all_not_loaded_ids = []
         id_list = sorted(read_messages.keys())
-        # print 'id_list', id_list
+
+        # 1. get the expandable for new threads
+        if thread_level == 0:
+            exp_domain = domain + [('id', '<', min(message_loaded_ids + id_list))]
+        else:
+            exp_domain = domain + ['!', ('id', 'child_of', message_loaded_ids + id_list)]
+        ids = self.search(cr, uid, exp_domain, context=context, limit=1)
+        if ids:
+            message_list.append(_get_expandable(exp_domain, -1, parent_id, -1, None))
+
+        # 2. get the expandables for new messages inside threads if display is not flat
+        if thread_level == 0:
+            return True
         for message_id in id_list:
             message = read_messages[message_id]
 
@@ -289,7 +313,7 @@ class mail_message(osv.Model):
                 continue
             # print 'not_loaded_ids', not_loaded_ids
 
-            all_not_loaded_ids += not_loaded_ids
+            # all_not_loaded_ids += not_loaded_ids
             # group childs not read
             id_min, id_max, nb = max(not_loaded_ids), 0, 0
             for not_loaded_id in not_loaded_ids:
@@ -309,14 +333,9 @@ class mail_message(osv.Model):
                 exp_domain = [('id', '>=', id_min), ('id', '<=', id_max), ('id', 'child_of', message_id)]
                 message_list.append(_get_expandable(exp_domain, nb, message_id, id_min, message.get('model')))
 
-        message_loaded_ids = list(set(message_loaded_ids + read_messages.keys() + all_not_loaded_ids))
+        # message_loaded_ids = list(set(message_loaded_ids + read_messages.keys() + all_not_loaded_ids))
 
-        # expandable for limit max
-        ids = self.search(cr, uid, domain + [('id', 'not in', message_loaded_ids)], context=context, limit=1)
-        if ids:
-            message_list.append(_get_expandable(domain, -1, parent_id, -1, None))
-
-        return message_list
+        return True
 
     def _get_parent(self, cr, uid, message, context=None):
         """ Tools method that tries to get the parent of a mail.message. If
@@ -333,14 +352,14 @@ class mail_message(osv.Model):
         except (orm.except_orm, osv.except_osv):
             return False
 
-    def message_read(self, cr, uid, ids=False, domain=None, message_unload_ids=None, context=None, parent_id=False, limit=None):
+    def message_read(self, cr, uid, ids=False, domain=None, message_unload_ids=None, thread_level=0, context=None, parent_id=False, limit=None):
         """ Read messages from mail.message, and get back a list of structured
             messages to be displayed as discussion threads. If IDs is set,
             fetch these records. Otherwise use the domain to fetch messages.
             After having fetch messages, their ancestors will be added to obtain
             well formed threads, if uid has access to them.
 
-            After reading the messages, expandables messages are added in the
+            After reading the messages, expandable messages are added in the
             message list (see ``_message_read_add_expandables``). It consists
             in messages holding the 'read more' data: number of messages to
             read, domain to apply.
@@ -355,6 +374,7 @@ class mail_message(osv.Model):
                 ancestors and expandables
             :return list: list of message structure for the Chatter widget
         """
+        assert thread_level in [0, 1], 'message_read() thread_level should be 0 (flat) or 1 (1 level of thread); given %s.' % thread_level
         domain = domain if domain is not None else []
         message_unload_ids = message_unload_ids if message_unload_ids is not None else []
         if message_unload_ids:
@@ -373,16 +393,18 @@ class mail_message(osv.Model):
         # TDE FIXME: check access rights on search are implemented for mail.message
         # fetch messages according to the domain, add their parents if uid has access to
         ids = self.search(cr, uid, domain, context=context, limit=limit)
-        # print 'message_read ids', ids
         for message in self.read(cr, uid, ids, self._message_read_fields, context=context):
-            # if not in tree and not in message_loded list
+            # if not in tree and not in message_loaded list
             if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
                 read_messages[message.get('id')] = message
                 message_list.append(self._message_get_dict(cr, uid, message, context=context))
 
-                # get the older ancestor the user can read
+                # get the older ancestor the user can read, update its ancestor field
+                if not thread_level:
+                    continue
                 parent = self._get_parent(cr, uid, message, context=context)
                 while parent and parent.get('id') != parent_id:
+                    message_list[-1]['ancestor_id'] = parent.get('id')
                     message = parent
                     parent = self._get_parent(cr, uid, message, context=context)
                 if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
@@ -391,9 +413,8 @@ class mail_message(osv.Model):
 
         # get the child expandable messages for the tree
         message_list = sorted(message_list, key=lambda k: k['id'])
-        # print 'message_read message_list', message_list
-        message_list = self._message_read_add_expandables(cr, uid, message_list, read_messages,
-            message_loaded_ids=message_unload_ids, domain=domain, context=context, parent_id=parent_id, limit=limit)
+        self._message_read_add_expandables(cr, uid, message_list, read_messages, thread_level=thread_level,
+            message_loaded_ids=message_unload_ids, domain=domain, parent_id=parent_id, context=context, limit=limit)
 
         # message_list = sorted(message_list, key=lambda k: k['id'])
         return message_list
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7501eabe104..6d013c1d564 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1047,7 +1047,7 @@ openerp.mail = function(session) {
             fetch_context = replace_context ? replace_context : this.context;
             var message_loaded = [this.datasets.id||0].concat( self.options.thread._parents[0].get_child_ids() );
 
-            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded, fetch_context, this.context.default_parent_id || undefined]
+            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded, 1, fetch_context, this.context.default_parent_id || undefined]
                 ).then(this.proxy('switch_new_message'));
         },
 

From 4c99b037a6134a47f29eb64c1f501f4316e67f6b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 23 Oct 2012 14:16:47 +0200
Subject: [PATCH 048/106] [IMP] mail: ancestor_id

bzr revid: chm@openerp.com-20121023121647-erx0p6416ufz6ni5
---
 addons/mail/static/src/js/mail.js | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d4aafa02733..0b8c39aca81 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1280,25 +1280,12 @@ openerp.mail = function(session) {
          */
         switch_new_message: function(records) {
             var self=this;
+            console.log(records);
             _(records).each(function(record){
                 var thread = self.browse_thread({
                     'id': record.ancestor_id, 
                     'default_return_top_thread':true
                 });
-
-                /*
-                record.thread_level = thread.thread_level;
-                record.options = {'_parents' : thread.options._parents };
-
-                // check for flat mode
-                var nb_level = thread.options.display_indented_thread - thread.thread_level;
-
-                if(nb_level <= 0){
-                    var thread = thread.options._parents[ thread.options._parents.length - 1 + nb_level ];
-                }
-                */
-
-
                 thread.create_message_object( record );
             });
         },
@@ -1376,6 +1363,7 @@ openerp.mail = function(session) {
                     'ancestor_id': message.ancestor_id,
                     'nb_messages': 1,
                     'thread_level': message.thread_level,
+                    'ancestor_id': message.ancestor_id
                     }, {
                     'domain': message_dom,
                     'context': {

From 7bae2a58fe122f07f9517532354d7e95f3463742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Oct 2012 14:28:24 +0200
Subject: [PATCH 049/106] [FIX] mail: message_read: expandable parent_id ->
 ancestor_id; ancestor is now correctly set for messages, even when the parent
 is not added to the message_list.

bzr revid: tde@openerp.com-20121023122824-yqhsr65cwygorani
---
 addons/mail/mail_message.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 6f6a838533b..7e03bca9caa 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -270,12 +270,12 @@ class mail_message(osv.Model):
                 easily have access to their values, given their ID
             :return bool: True
         """
-        def _get_expandable(domain, message_nb, parent_id, id, model):
+        def _get_expandable(domain, message_nb, ancestor_id, id, model):
             return {
                 'domain': domain,
                 'nb_messages': message_nb,
                 'type': 'expandable',
-                'parent_id': parent_id,
+                'ancestor_id': ancestor_id,
                 'id':  id,
                 # TDE note: why do we need model sometimes, and sometimes not ???
                 'model': model,
@@ -400,14 +400,13 @@ class mail_message(osv.Model):
                 message_list.append(self._message_get_dict(cr, uid, message, context=context))
 
                 # get the older ancestor the user can read, update its ancestor field
-                if not thread_level:
-                    continue
                 parent = self._get_parent(cr, uid, message, context=context)
                 while parent and parent.get('id') != parent_id:
                     message_list[-1]['ancestor_id'] = parent.get('id')
                     message = parent
                     parent = self._get_parent(cr, uid, message, context=context)
-                if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
+                # if in thread: add its ancestor to the list of messages
+                if thread_level and not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
                     read_messages[message.get('id')] = message
                     message_list.append(self._message_get_dict(cr, uid, message, context=context))
 

From b4bcff666a722778d35930279de499ee838290ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Oct 2012 15:27:55 +0200
Subject: [PATCH 050/106] [FIX] mail: message_read: ancestor_id is set in
 thread mode as the first displayed ancestor; ancestor_id is set to parent_id
 parameter in flat mode.

bzr revid: tde@openerp.com-20121023132755-dp29bake9eux5vz7
---
 addons/mail/mail_message.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 7e03bca9caa..fdcc1e73ec5 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -368,8 +368,10 @@ class mail_message(osv.Model):
             :param list domain: optional domain for searching ids if ids not set
             :param list message_unload_ids: optional ids we do not want to fetch,
                 because i.e. they are already displayed somewhere
-            :param int parent_id: if parent_id reached when adding ancestors,
-                stop going further in the ancestor search
+            :param int parent_id: context of parent_id
+                - if parent_id reached when adding ancestors, stop going further
+                  in the ancestor search
+                - if set in flat mode, ancestor_id is set to parent_id
             :param int limit: number of messages to fetch, before adding the
                 ancestors and expandables
             :return list: list of message structure for the Chatter widget
@@ -400,13 +402,16 @@ class mail_message(osv.Model):
                 message_list.append(self._message_get_dict(cr, uid, message, context=context))
 
                 # get the older ancestor the user can read, update its ancestor field
+                if not thread_level:
+                    message_list[-1]['ancestor_id'] = parent_id
+                    continue
                 parent = self._get_parent(cr, uid, message, context=context)
                 while parent and parent.get('id') != parent_id:
                     message_list[-1]['ancestor_id'] = parent.get('id')
                     message = parent
                     parent = self._get_parent(cr, uid, message, context=context)
                 # if in thread: add its ancestor to the list of messages
-                if thread_level and not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
+                if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
                     read_messages[message.get('id')] = message
                     message_list.append(self._message_get_dict(cr, uid, message, context=context))
 

From 056db11d0b91da953fcee17f846e2951e8f68fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Oct 2012 15:43:29 +0200
Subject: [PATCH 051/106] [TEST] mail: added first draft of tests for
 message_read and expandables.

bzr revid: tde@openerp.com-20121023134329-m5hnpg2eosn7x3tq
---
 addons/mail/tests/test_mail.py | 168 +++++++++++++++++++++++++++++----
 1 file changed, 148 insertions(+), 20 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 9fdabca315c..7668d743eab 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -526,10 +526,25 @@ class test_mail(TestMailMockups):
 
     def test_30_message_read(self):
         """ Tests for message_read and expandables. """
+
+        def _print_debug(message, debug=True, prefix=''):
+            if debug:
+                print prefix, message
+
+        def _print_msg(message, debug=True, prefix=''):
+            if not debug:
+                return
+            if message.get('type') == 'expandable':
+                print prefix, 'expandable', message
+            else:
+                print prefix, 'message', message.get('body'), message.get('id'), message.get('ancestor_id')
+
+        _debug = False
         cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
         pigs_domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]
 
         # Data: create a discussion in Pigs (2 messages, one with 2 and one with 3 answers)
+        msg_id0 = self.group_pigs.message_post(body='0', subtype='mt_comment')
         msg_id1 = self.group_pigs.message_post(body='1', subtype='mt_comment')
         msg_id2 = self.group_pigs.message_post(body='2', subtype='mt_comment')
         msg_id3 = self.group_pigs.message_post(body='1-1', subtype='mt_comment', parent_id=msg_id1)
@@ -540,40 +555,153 @@ class test_mail(TestMailMockups):
         msg_id8 = self.group_pigs.message_post(body='2-1-1', subtype='mt_comment', parent_id=msg_id4)
         msg_id9 = self.group_pigs.message_post(body='1-1-1', subtype='mt_comment', parent_id=msg_id3)
         msg_id10 = self.group_pigs.message_post(body='2-1-1', subtype='mt_comment', parent_id=msg_id4)
-        msg_ids = [msg_id1, msg_id2, msg_id3, msg_id4, msg_id5, msg_id6, msg_id7, msg_id8, msg_id9, msg_id10]
+        msg_ids = [msg_id0, msg_id1, msg_id2, msg_id3, msg_id4, msg_id5, msg_id6, msg_id7, msg_id8, msg_id9, msg_id10]
 
         # Test: read some specific ids
         read_msg_list = self.mail_message.message_read(cr, uid, ids=msg_ids[2:4], domain=[('body', 'like', 'dummy')])
         read_msg_ids = [msg.get('id') for msg in read_msg_list]
         self.assertEqual(msg_ids[2:4], read_msg_ids, 'message_read with direct ids should read only the requested ids')
 
-        # Test: read messages of Pigs through a domain
+        # Test: read messages of Pigs through a domain, being thread or not threaded
         read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=200)
         read_msg_ids = [msg.get('id') for msg in read_msg_list]
-        self.assertEqual(msg_ids, read_msg_ids, 'message_read with domain on Pigs should equal all messages of Pigs')
+        self.assertEqual(msg_ids, read_msg_ids, 'message_read flat with domain on Pigs should equal all messages of Pigs')
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=200, thread_level=1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list]
+        self.assertEqual(msg_ids, read_msg_ids, 'message_read threaded with domain on Pigs should equal all messages of Pigs')
 
-        # Test: read last message, check expandables
-        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=1)
+        # ----------------------------------------
+        # CASE1: message_read with domain, threaded
+        # We simulate an entire flow, using the expandables to test them
+        # ----------------------------------------
+        _print_debug('\nCASE1: message_read with domain, threaded\n', _debug)
+
+        # Do: read last message, threaded
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=1, thread_level=1)
         read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
-        # Test: parent is added to the read messages
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
+        self.assertEqual(len(read_msg_list), 4, 'message_read on last Pigs message should return 2 messages and 2 expandables')
         self.assertEqual(set([msg_id2, msg_id10]), set(read_msg_ids), 'message_read on the last Pigs message should also get its parent')
-        print read_msg_ids
-        # Test: expandables
-        # 1. expandable for childs of Body2 before the last reply
-        # 2. expandable for messages before Body2
+        self.assertEqual(read_msg_list[1].get('ancestor_id'), read_msg_list[0].get('id'), 'message_read should set the ancestor to the thread header')
+        # Data: get expandables
+        new_threads_exp, new_msg_exp = None, None
         for msg in read_msg_list:
-            if msg.get('type') == 'expandable':
-                print msg
-            # 'read more threads' expandable
+            _print_msg(msg, _debug)
             if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('id') == -1:
-                domain = msg.get('domain', [])
-                self.assertEqual(set(domain), set(pigs_domain), 'general expandable domain should equal the message_read domain parameter')
-            # 'read more messages' expandables
+                new_threads_exp = msg
             elif msg.get('type') == 'expandable':
-                domain = msg.get('domain', [])
-                self.assertIn(('id', 'child_of', msg_id2), domain, 'thread expandable domain should contain a child_of condition')
-                self.assertIn(('id', '>=', msg_id4), domain, 'thread expandable domain should contain a child_of condition')
-                self.assertIn(('id', '<=', msg_id8), domain, 'thread expandable domain should contain a child_of condition')
+                new_msg_exp = msg
+
+        # Do: fetch new messages in first thread, domain from expandable
+        self.assertIsNotNone(new_msg_exp, 'message_read on last Pigs message should have returned a new messages expandable')
+        domain = new_msg_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        _print_debug('Executing %s' % domain, _debug)
+        self.assertIn(('id', 'child_of', msg_id2), domain, 'new messages expandable domain should contain a child_of condition')
+        self.assertIn(('id', '>=', msg_id4), domain, 'new messages expandable domain should contain an id greater than condition')
+        self.assertIn(('id', '<=', msg_id8), domain, 'new messages expandable domain should contain an id less than condition')
+        self.assertEqual(new_msg_exp.get('ancestor_id'), msg_id2, 'new messages expandable should have ancestor_id set to the thread header')
+        # Do: message_read with domain, thread_level=0, parent_id=msg_id2 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=200, thread_level=0, parent_id=msg_id2)
+        for msg in read_msg_list:
+            _print_msg(msg, _debug)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: other message in thread have been fetch
+        self.assertEqual(set([msg_id4, msg_id6, msg_id8]), set(read_msg_ids), 'message_read in Pigs thread should return all the previous messages')
+
+        # Do: fetch a new thread, domain from expandable
+        self.assertIsNotNone(new_threads_exp, 'message_read on last Pigs message should have returned a new threads expandable')
+        domain = new_threads_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        _print_debug('Executing %s' % domain, _debug)
+        for condition in pigs_domain:
+            self.assertIn(condition, domain, 'new threads expandable domain should contain the message_read domain parameter')
+        self.assertFalse(new_threads_exp.get('ancestor_id'), 'new threads expandable should not have an ancestor_id')
+        # Do: message_read with domain, thread_level=1 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=1, thread_level=1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
+        self.assertEqual(len(read_msg_list), 4, 'message_read on Pigs should return 2 messages and 2 expandables')
+        self.assertEqual(set([msg_id1, msg_id9]), set(read_msg_ids), 'message_read on a Pigs message should also get its parent')
+        self.assertEqual(read_msg_list[1].get('ancestor_id'), read_msg_list[0].get('id'), 'message_read should set the ancestor to the thread header')
+        # Data: get expandables
+        new_threads_exp, new_msg_exp = None, None
+        for msg in read_msg_list:
+            _print_msg(msg, _debug)
+            if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('id') == -1:
+                new_threads_exp = msg
+            elif msg.get('type') == 'expandable':
+                new_msg_exp = msg
+
+        # Do: fetch new messages in second thread, domain from expandable
+        self.assertIsNotNone(new_msg_exp, 'message_read on Pigs message should have returned a new messages expandable')
+        domain = new_msg_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        _print_debug('Executing %s' % domain, _debug)
+        self.assertIn(('id', 'child_of', msg_id1), domain, 'new messages expandable domain should contain a child_of condition')
+        self.assertIn(('id', '>=', msg_id3), domain, 'new messages expandable domain should contain an id greater than condition')
+        self.assertIn(('id', '<=', msg_id7), domain, 'new messages expandable domain should contain an id less than condition')
+        self.assertEqual(new_msg_exp.get('ancestor_id'), msg_id1, 'new messages expandable should have ancestor_id set to the thread header')
+        # Do: message_read with domain, thread_level=0, parent_id=msg_id1 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=200, thread_level=0, parent_id=msg_id1)
+        for msg in read_msg_list:
+            _print_msg(msg, _debug)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: other message in thread have been fetch
+        self.assertEqual(set([msg_id3, msg_id5, msg_id7]), set(read_msg_ids), 'message_read on the last Pigs message should also get its parent')
+
+        # Test: fetch a new thread, domain from expandable
+        self.assertIsNotNone(new_threads_exp, 'message_read should have returned a new threads expandable')
+        domain = new_threads_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        _print_debug('Executing %s' % domain, _debug)
+        for condition in pigs_domain:
+            self.assertIn(condition, domain, 'general expandable domain should contain the message_read domain parameter')
+        # Do: message_read with domain, thread_level=1 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=1, thread_level=1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
+        self.assertEqual(len(read_msg_list), 1, 'message_read on Pigs should return 1 message because everything else has been fetched')
+        self.assertEqual([msg_id0], read_msg_ids, 'message_read after 2 More should return only 1 last message')
+        for msg in read_msg_list:
+            _print_msg(msg, _debug)
+
+        # ----------------------------------------
+        # CASE2: message_read with domain, flat
+        # ----------------------------------------
+        _print_debug('\nCASE2: message_read with domain, flat\n', _debug)
+
+        # Do: read 2 lasts message, flat
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=2, thread_level=0)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is not set, 1 expandable
+        self.assertEqual(len(read_msg_list), 3, 'message_read on last Pigs message should return 2 messages and 1 expandable')
+        self.assertEqual(set([msg_id9, msg_id10]), set(read_msg_ids), 'message_read flat on Pigs last messages should only return those messages')
+        self.assertFalse(read_msg_list[0].get('ancestor_id'), 'message_read flat should set the ancestor as False')
+        self.assertFalse(read_msg_list[1].get('ancestor_id'), 'message_read flat should set the ancestor as False')
+        # Data: get expandables
+        new_threads_exp, new_msg_exp = None, None
+        for msg in read_msg_list:
+            _print_msg(msg, _debug)
+            if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('id') == -1:
+                new_threads_exp = msg
+
+        # Do: fetch new messages, domain from expandable
+        self.assertIsNotNone(new_threads_exp, 'message_read flat on the 2 last Pigs messages should have returns a new threads expandable')
+        domain = new_threads_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        _print_debug('Executing %s' % domain, _debug)
+        for condition in pigs_domain:
+            self.assertIn(condition, domain, 'new threads expandable domain should contain the message_read domain parameter')
+        # Do: message_read with domain, thread_level=0 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=20, thread_level=0)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
+        self.assertEqual(len(read_msg_list), 9, 'message_read on Pigs should return 9 messages and 0 expandable')
+        self.assertEqual([msg_id0, msg_id1, msg_id2, msg_id3, msg_id4, msg_id5, msg_id6, msg_id7, msg_id8], read_msg_ids,
+            'message_read, More on flat, should return all remaning messages')
+        for msg in read_msg_list:
+            _print_msg(msg, _debug)
 
     def test_40_needaction(self):
         """ Tests for mail.message needaction. """

From 5ca5acef4119b41650efb494b321fc9c2393882d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 23 Oct 2012 17:58:27 +0200
Subject: [PATCH 052/106] [IMP] mail: mail composer design

bzr revid: fva@openerp.com-20121023155827-au8m4bzz3hlfie3v
---
 addons/mail/__openerp__.py                    |   1 -
 addons/mail/static/src/css/mail.css           |  90 ++++++++++
 .../static/src/css/mail_compose_message.css   | 166 ------------------
 addons/mail/static/src/js/mail.js             |   8 +-
 addons/mail/static/src/xml/mail.xml           |  32 ++--
 5 files changed, 111 insertions(+), 186 deletions(-)
 delete mode 100644 addons/mail/static/src/css/mail_compose_message.css

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 27565bc4102..0c32ba27d6f 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -84,7 +84,6 @@ Main Features
     'css': [
         'static/src/css/mail.css',
         'static/src/css/mail_group.css',
-        'static/src/css/mail_compose_message.css',
     ],
     'js': [
         'static/lib/jquery.expander/jquery.expander.js',
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index f4dd52c4ca4..d40017bf403 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -72,6 +72,11 @@
     padding: 4px;
     padding-bottom:1px;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_title{
+    font-size: 16px;
+    margin-bottom: 0px;
+    margin-top: 2px;
+}
 .openerp .oe_mail .oe_msg .oe_msg_icons{
     float: right;
     margin-top: 4px;
@@ -123,6 +128,7 @@
     margin: 0px;
     padding: 0px;
     resize: vertical;
+    padding: 4px;
 }
 .openerp .oe_mail .oe_msg.oe_msg_composer_compact, .openerp .oe_mail .oe_msg.oe_msg_expandable{
     padding:4px;
@@ -139,6 +145,90 @@
 .openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
     display:none;
 }
+/* ---------------- MESSAGE QUICK COMPOSER --------------- */
+
+.openerp .oe_mail .oe_msg_composer .oe_msg_footer{
+    padding-right:4px;
+    padding-top: 2px;
+    padding-bottom:6px;
+}
+.openerp .oe_mail .oe_msg_attachments.oe_hidden{
+    margin:0px;
+    border: none;
+}
+.openerp .oe_mail .oe_msg_attachments{
+    margin-bottom: 4px;
+    margin-right: 0px;
+    font-size: 12px;
+    border-radius: 2px;
+    border: solid 1px rgba(124,123,173,0.14);
+}
+.openerp .oe_mail .oe_msg_attachments .oe_attachment{
+    padding: 2px;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+.openerp .oe_mail .oe_msg_attachments .oe_attachment .oe_e{
+    font-size: 23px;
+    margin-top: -5px;
+}
+.openerp .oe_mail .oe_msg_attachments .oe_attachment .oe_e:hover{
+    text-decoration: none;
+}
+.openerp .oe_mail .oe_msg_attachments .oe_attachment:nth-child(odd){
+    background:white;
+}
+.openerp .oe_mail .oe_msg_attachments .oe_attachment:nth-child(even){
+    background: #F4F5FA;
+}
+.openerp .oe_mail .oe_msg_footer button{
+    display: inline;
+    height: 24px;
+    font-size: 12px;
+    line-height: 12px;
+    vertical-align: middle;
+}
+.openerp .oe_mail .oe_msg_footer button.oe_attach{
+    width: 24px;
+    overflow: hidden;
+}
+.openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{
+    position: relative;
+    top: -1px;
+    left: -9px;
+}
+.openerp .oe_mail .oe_hidden_input_file, .openerp .oe_mail .oe_hidden_input_file form{
+    display:inline;
+}
+.openerp .oe_mail .oe_msg_footer button.oe_full{
+    width:24px;
+    overflow:hidden;
+    float: right;
+}
+.openerp .oe_mail .oe_msg_footer button.oe_full .oe_e{
+    position: relative;
+    top: -1px;
+    left: -9px;
+}
+.openerp .oe_mail button.oe_attach, .openerp .oe_mail button.oe_full{
+    background: transparent; 
+    color: #7C7BAD;
+    box-shadow: none;
+    border: none;
+    text-shadow: none;
+}
+.openerp .oe_mail .oe_msg_footer .oe_attachment_file .oe_form_binary_file{
+    display: inline-block;
+    margin-left: -23px;
+    height: 24px;
+    width: 24px;
+    margin-top: -6px;
+}
+.openerp .oe_mail .oe_mail_list_recipients{
+    font-size: 12px;
+    margin-top: 4px;
+    margin-bottom: 4px;
+}
 
 /* ---------------- HIDDEN MESSAGES ------------------ */
 
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
deleted file mode 100644
index c706c55bcde..00000000000
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ------------------------------ */
-/* Compose Message */
-/* ------------------------------ */
-
-.openerp .oe_msg_content .oe_mail_compose_message_footer {
-    height: 24px;
-}
-
-.openerp .oe_msg_content .oe_mail_compose_message_footer button.oe_mail_compose_message_button_send {
-    float: left;
-}
-
-.openerp .oe_mail .oe_mail_compose_textarea
-{
-   display: none;
-}
-
-.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_header,
-.openerp .oe_mail .oe_mail_compose_textarea .oe_mail_post_footer,
-{
-    position: relative;
-}
-
-.openerp .oe_mail .oe_mail_compose_textarea a.oe_cancel {
-    position: absolute;
-    right: -8px;
-    top: -8px;
-}
-.openerp .oe_mail .oe_mail_compose_textarea a.oe_cancel:first-of-type {
-    display:none;
-}
-
-.openerp .oe_mail .oe_mail_compose_textarea button.oe_full {
-    float: right;
-    position: relative;
-    right: -10px;
-}
-
-/* ------------------------------------------------------------ */
-/* mail.compose.message : list_recipients
-/* ------------------------------------------------------------ */
-
-.openerp .oe_mail .oe_mail_list_recipients {
-    display: inline;
-}
-.openerp .oe_mail .oe_mail_list_recipients .oe_all_follower {
-    color: blue;
-}
-.openerp .oe_mail .oe_mail_list_recipients .oe_partner_follower a {
-    color: red;
-}
-.openerp .oe_mail .oe_mail_list_recipients .oe_hidden,
-.openerp .oe_mail .oe_mail_list_recipients .oe_more_hidden {
-    display: none;
-}
-
-/* ------------------------------------------------------------ */
-/* mail.compose.message : attachment
-/* ------------------------------------------------------------ */
-
-.openerp .oe_mail .oe_attachment_file  {
-    display: inline-block;
-}
-
-.openerp .oe_mail .oe_attachment_file .oe_add  {
-    float: left;
-    width: 24px;
-    height: 24px;
-    position: relative;
-    z-index: 10;
-    left: +2px;
-    top: +7px;
-    overflow: hidden;
-}
-
-/* attachment button: override of openerp values */
-.openerp .oe_mail .oe_attachment_file .oe_add button,
-.openerp .oe_mail .oe_attachment_file .oe_add input.oe_insert_file {
-    position: absolute;
-    bottom: +0px;
-    left: +0px;
-    height: 24px;
-    width: 24px;
-    margin: 0px;
-    padding: 0px;
-}
-.openerp .oe_mail .oe_attachment_file .oe_add input.oe_insert_file {
-    z-index:2;
-    width: 300px;
-    left: -100px;
-    background: transparent;
-    border: 0;
-    color: transparent;
-}
-.openerp .oe_mail .oe_attachment_file .oe_add button span {
-    position: relative;
-    bottom: +4px;
-    font-size: 30px;
-}
-
-.openerp .oe_mail .oe_msg_attachments input {
-    visibility: hidden;
-}
-
-.openerp .oe_mail .oe_mail_compose_attachment_list {
-    clear: both;
-}
-
-/* ------------------------------------------------------------ */
-/* mail.compose.message
-/* ------------------------------------------------------------ */
-
-
-/* default textarea (oe_mail_compose_textarea), and body textarea for compose form view */
-.openerp .oe_mail.oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text,
-.openerp .oe_mail div.oe_mail_compose_message_body textarea.field_text {
-    width: 100%;
-    min-height: 120px;
-    height: auto;
-    padding: 4px;
-    font-size: 12px;
-    border: 1px solid #cccccc;
-}
-
-/* not top textarea */
-.openerp .oe_mail.oe_semantic_html_override .oe_semantic_html_override .oe_mail_compose_textarea textarea.field_text {
-    height: 60px;
-}
-
-/* form_view: delete white background */
-.openerp .oe_msg_content div.oe_formview {
-    background-color: transparent;
-}
-
-.openerp .oe_msg_content div.oe_form_nosheet {
-    margin: 0px;
-}
-
-.openerp .oe_msg_content table.oe_form_group {
-    margin: 0px;
-}
-
-.openerp .oe_msg_content table.oe_form_field,
-.openerp .oe_msg_content div.oe_form_field {
-    padding: 0px;
-}
-
-.openerp .oe_msg_content td.oe_form_group_cell {
-    vertical-align: bottom;
-}
-
-/* subject: change width */
-.openerp .oe_msg_content .oe_form .oe_form_field input[type='text'] {
-    width: 472px;
-}
-
-/* body_html: cleditor */
-.openerp .oe_msg_content div.cleditorMain {
-    border: 1px solid #cccccc;
-}
-
-/* destination_partner_ids */
-.openerp .oe_msg_content div.text-core {
-    height: 22px !important;
-    width: 472px;
-}
\ 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 025e5d43b9a..649444deedd 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -198,6 +198,7 @@ openerp.mail = function(session) {
         /* when a user click on the upload button, send file read on_attachment_loaded
         */
         on_attachment_change: function (event) {
+            console.log('attach');
             event.stopPropagation();
             var self = this;
             var $target = $(event.target);
@@ -304,9 +305,9 @@ openerp.mail = function(session) {
                 // set the function called when attachments are added
                 this.$render_expandable.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
 
-                this.$render_expandable.on('click', 'a.oe_cancel', self.on_cancel );
-                this.$render_expandable.on('click', 'button.oe_post', function(){self.on_message_post()} );
-                this.$render_expandable.on('click', 'button.oe_full', function(){self.on_compose_fullmail()} );
+                this.$render_expandable.on('click', '.oe_cancel', self.on_cancel );
+                this.$render_expandable.on('click', '.oe_post', function(){self.on_message_post()} );
+                this.$render_expandable.on('click', '.oe_full', function(){self.on_compose_fullmail()} );
 
                 // auto close
                 this.$render_expandable.on('blur', 'textarea', this.on_compose_expandable);
@@ -365,6 +366,7 @@ openerp.mail = function(session) {
 
         /*post a message and fetch the message*/
         on_message_post: function (body) {
+            console.log('post');
             var self = this;
 
             if (! body) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 64cde6e9337..125376deb57 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -21,14 +21,14 @@
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
-                    <textarea class="field_text" placeholder="Add your comment here..."/>
+                    <t t-call="mail.thread.list_recipients"/>
+                    <textarea class="field_text" placeholder=""/>
                 </div><div class="oe_msg_footer">
                     <div class="oe_msg_attachment_list"/>
                     <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
-                    <t t-call="mail.thread.list_recipients"/>
                     <!--<a class="oe_cancel oe_e">X</a>-->
-                    <button class="oe_full oe_right">Full</button>
+                    <button class="oe_full"><span class='oe_e'>&amp;ograve</span></button>
                 </div>
             </div>
         </div>
@@ -41,7 +41,7 @@
         -->
     <t t-name="mail.compose_message.compact">
         <div class="oe_msg oe_msg_composer_compact">
-            <textarea class="field_text oe_compact" placeholder="Add your comment here..."/>
+            <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
     </t>
 
@@ -50,10 +50,10 @@
         Small template to be inserted in the composition for add attachments
         -->
     <t t-name="mail.compose_message.add_attachment">
-        <div class="oe_attachment_file">
-            <div class="oe_add">
+        <span class="oe_attachment_file">
+            <span class="oe_add">
                 <!-- uploader of file -->
-                <button><span class="oe_e">p</span></button>
+                <button class="oe_attach"><span class="oe_e">'</span></button>
                 <t t-call="HiddenInputFile">
                     <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
                     <t t-set="fileupload_action">/web/binary/upload_attachment</t>
@@ -61,8 +61,8 @@
                     <input type="hidden" name="id" value="0"/>
                     <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
                 </t>
-            </div>
-        </div>
+            </span>
+        </span>
     </t>
 
     <!--
@@ -70,9 +70,9 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <ul t-attf-class="oe_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
+        <div t-attf-class="oe_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
             <t t-foreach="widget.attachment_ids" t-as="attachment">
-                <li>
+                <div class="oe_attachment">
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
                             <span>...Upload in progress...</span>
@@ -83,11 +83,11 @@
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
                     <t t-if="(widget.show_delete_attachment and (!attachment.upload or attachment.percent_loaded&gt;=100))">
-                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
+                        <a class="oe_right oe_mail_attachment_delete oe_e" title="Delete this attachment" t-attf-data-id="{attachment.id}">[</a>
                     </t>
-                </li>
+                </div>
             </t>
-        </ul>
+        </div>
     </t>
 
     <t t-name="mail.thread.message.private">
@@ -103,8 +103,8 @@
         -->
     <t t-name="mail.thread.list_recipients">
         <div class="oe_mail_list_recipients">
-            Post to:
-            <span t-if="!widget.is_private" class="oe_all_follower">All Followers</span> 
+            To:
+            <span t-if="!widget.is_private" class="oe_all_follower">Everyone</span> 
             <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>

From 9be4003dfcc0df1f2a702b4c0ccae6cca7e04e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 23 Oct 2012 18:43:58 +0200
Subject: [PATCH 053/106] [IMP] mail: made mail widget marginless

bzr revid: fva@openerp.com-20121023164358-7jjlaqa0nv688edv
---
 addons/mail/static/src/css/mail.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d40017bf403..d21867b031f 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,10 +1,15 @@
+.oe_mail_wall_threads{
+    padding: 16px;
+}
+
+/* ------------ MAIL WIDGET --------------- */
 .openerp .oe_mail, .openerp .oe_mail *{
     box-sizing: border-box;
 }
 .openerp .oe_mail {
     position: relative;
     width: 740px;
-    margin: 16px;
+    margin: 0px;
 }
 .openerp .oe_mail .oe_thread{
     margin-left: 32px;

From 2055dacf04edcec544332d84d3f3701e049d8049 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 11:25:03 +0200
Subject: [PATCH 054/106] [IMP] mail: use widget one2many_binary

bzr revid: chm@openerp.com-20121024092503-mpk7f1vd8jqynvqc
---
 .../wizard/mail_compose_message_view.xml           |  2 +-
 addons/mail/__openerp__.py                         |  1 +
 addons/mail/wizard/mail_compose_message_view.xml   | 14 ++++----------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index a33135ca098..05d0e8dffa1 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//form/notebook" position="after">
+                    <xpath expr="//form/group" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}">
                             <field name="use_template" invisible="1"
                                 on_change="onchange_use_template(use_template, template_id, composition_mode, model, res_id, context)"/>
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 27565bc4102..99583acdaf7 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -90,6 +90,7 @@ Main Features
         'static/lib/jquery.expander/jquery.expander.js',
         'static/src/js/mail.js',
         'static/src/js/mail_followers.js',
+        'static/src/js/mail_uploader.js',
     ],
     'qweb': [
         'static/src/xml/mail.xml',
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 255954e31c1..4d3f3934392 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -14,20 +14,14 @@
                         <field name="parent_id" invisible="1"/>
                         <field name="content_subtype" invisible="1"/>
                         <!-- visible wizard -->
-                        <field name="subject" placeholder="Subject..."
-                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>/>
                         <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
                                 context="{'force_email':True}"
                                 on_change="onchange_partner_ids(partner_ids)"/>
+                        <field name="subject" placeholder="Subject..."
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>/>
+                        <field name="attachment_ids" colspan="4" nolabel="1" widget="one2many_binary" blockui="1"/>
+                        <field name="body" colspan="4" nolabel="1"/>
                     </group>
-                    <notebook>
-                        <page string="Body">
-                            <field name="body" nolabel="1"/>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
                     <footer>
                         <button string="Send" name="send_mail" type="object" class="oe_highlight"  />
                         or

From 502fa126a7d7491060c9210c20a4691189c86e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 24 Oct 2012 11:45:06 +0200
Subject: [PATCH 055/106] [IMP] mail widget is now inline-block

bzr revid: fva@openerp.com-20121024094506-zy79cj8bai4t5zes
---
 addons/mail/static/src/css/mail.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d21867b031f..a1f2b5c4910 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -7,6 +7,7 @@
     box-sizing: border-box;
 }
 .openerp .oe_mail {
+    display: inline-block;
     position: relative;
     width: 740px;
     margin: 0px;

From 7a507ea93e5ffddc0f1dc7cc65cbd807042fa112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 24 Oct 2012 12:05:18 +0200
Subject: [PATCH 056/106] [FIX] mail: show compose in form comments

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

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ee80f5f7c89..2890e9eda6e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1555,7 +1555,8 @@ openerp.mail = function(session) {
                 'show_reply_button': 0,
                 'show_read_unread_button': -1,
                 'show_compose_message': show_compose_message,
-                'message_ids': message_ids
+                'message_ids': message_ids,
+                'show_compact_message': true,
                 }
             );
 
@@ -1653,7 +1654,7 @@ openerp.mail = function(session) {
                 'show_reply_button': 10,
                 'show_read_unread_button': 11,
                 'show_compose_message': true,
-                'show_compact_message': true
+                'show_compact_message': true,
                 }
             );
 

From 875b2ede23cdc52ac9a2c96bbd22f527c428e0aa Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 14:28:03 +0200
Subject: [PATCH 057/106] [IMP] mail: use widget one2many_binary and value fix

bzr revid: chm@openerp.com-20121024122803-ihr421qcvnsd3cjz
---
 addons/mail/mail_thread.py                    |  2 +-
 addons/mail/static/src/js/mail.js             | 58 +++++++------------
 addons/mail/static/src/xml/mail.xml           |  2 +-
 .../mail/wizard/mail_compose_message_view.xml | 10 ++--
 4 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 04da686b49d..af4818bcbcd 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -703,7 +703,7 @@ class mail_thread(osv.AbstractModel):
         if attachments:
             ir_attachment = self.pool.get('ir.attachment')
             mail_message = self.pool.get('mail.message')
-            attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [('res_model', '=', 'mail.message'), ('res_id', '=', 0), ('create_uid', '=', uid), ('id', 'in', attachments)], context=context)
+            attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [('res_model', '=', 'mail.compose.message'), ('res_id', '=', 0), ('create_uid', '=', uid), ('id', 'in', attachments)], context=context)
             if attachment_ids:
                 ir_attachment.write(cr, SUPERUSER_ID, attachment_ids, {'res_model': self._name, 'res_id': thread_id}, context=context)
                 mail_message.write(cr, SUPERUSER_ID, [new_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]}, context=context)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0b8c39aca81..cda2a6fbd70 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -275,26 +275,6 @@ openerp.mail = function(session) {
             }
         },
 
-        /* to avoid having unsorted file on the server.
-            we will show the users files of the first message post
-            TDE note: unnecessary call to server I think
-         */
-        // set_free_attachments: function(){
-        //     var self=this;
-        //     this.parent_thread.ds_message.call('user_free_attachment').then(function(attachments){
-        //         this.attachment_ids=[];
-        //         for(var i in attachments){
-        //             self.attachment_ids[i]={
-        //                 'id': attachments[i].id,
-        //                 'name': attachments[i].name,
-        //                 'filename': attachments[i].filename,
-        //                 'url': mail.ChatterUtils.get_attachment_url(self.session, attachments[i])
-        //             };
-        //         }
-        //         self.display_attachments();
-        //     });
-        // },
-
         bind_events: function() {
             var self = this;
 
@@ -318,10 +298,6 @@ openerp.mail = function(session) {
         },
 
         on_compose_fullmail: function(){
-            var attachments=[];
-            for(var i in this.attachment_ids){
-                attachments.push(this.attachment_ids[i].id);
-            }
             /* TDE note: I think this is not necessary, because
              * 1/ post on a document: followers added server-side in _notify
              * 2/ reply to a message: mail.compose.message should add the previous partners
@@ -340,15 +316,20 @@ openerp.mail = function(session) {
                 target: 'new',
                 context: {
                     'default_model': this.context.default_model,
+                    'default_res_model': this.context.default_model,
                     'default_res_id': this.context.default_res_id,
                     'default_content_subtype': 'html',
-                    'default_ancestor_id': this.id,
+                    'default_parent_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
-                    'default_attachment_ids': attachments,
+                    'default_attachment_ids': this.attachment_ids,
                     'default_partner_ids': partner_ids
                 },
             };
             this.do_action(action);
+
+            if(this.$render_expandable) {
+                this.on_cancel();
+            }
         },
 
         on_cancel: function(event){
@@ -390,7 +371,7 @@ openerp.mail = function(session) {
                         false, 
                         'comment', 
                         'mail.mt_comment',
-                        this.context.default_ancestor_id, 
+                        this.context.default_parent_id, 
                         attachments,
                         this.parent_thread.context
                     ]).then(function(records){
@@ -482,7 +463,7 @@ openerp.mail = function(session) {
             this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id: 0,
-                default_ancestor_id: false }, options.context || {});
+                default_parent_id: false }, options.context || {});
 
             // data of this expandable message
             this.id = datasets.id || -1,
@@ -620,7 +601,7 @@ openerp.mail = function(session) {
             this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id: 0,
-                default_ancestor_id: false }, options.context || {});
+                default_parent_id: false }, options.context || {});
 
             // record options
             this.options = options.options;
@@ -727,7 +708,7 @@ openerp.mail = function(session) {
                     'context':{
                         'default_model': this.model,
                         'default_res_id': this.res_id,
-                        'default_ancestor_id': this.id
+                        'default_parent_id': this.id
                     },
                     'options': this.options
                 }
@@ -929,7 +910,7 @@ openerp.mail = function(session) {
             this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id: 0,
-                default_ancestor_id: false }, options.context || {});
+                default_parent_id: false }, options.context || {});
 
             this.options = options.options;
             this.options._parents = (options.options._parents != undefined ? options.options._parents : []).concat( [this] );
@@ -1148,7 +1129,7 @@ openerp.mail = function(session) {
             // CHM note : option for sending in flat mode by server
             var nb_indented_thread = this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0;
 
-            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, nb_indented_thread, fetch_context, this.context.default_ancestor_id || undefined]
+            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, nb_indented_thread, fetch_context, this.context.default_parent_id || undefined]
                 ).then(this.proxy('switch_new_message'));
         },
 
@@ -1167,7 +1148,7 @@ openerp.mail = function(session) {
                     'context': {
                         'default_model': data.model || self.context.default_model,
                         'default_res_id': data.res_id || self.context.default_res_id,
-                        'default_ancestor_id': self.id },
+                        'default_parent_id': self.id },
                 });
             } else {
                 var message = new mail.ThreadMessage(self, _.extend(data, {'thread_level': data.thread_level ? data.thread_level : self.thread_level}), {
@@ -1175,7 +1156,7 @@ openerp.mail = function(session) {
                     'context': {
                         'default_model': data.model,
                         'default_res_id': data.res_id,
-                        'default_ancestor_id': data.id },
+                        'default_parent_id': data.id },
                     'options': _.extend(self.options, data.options)
                 });
             }
@@ -1280,7 +1261,6 @@ openerp.mail = function(session) {
          */
         switch_new_message: function(records) {
             var self=this;
-            console.log(records);
             _(records).each(function(record){
                 var thread = self.browse_thread({
                     'id': record.ancestor_id, 
@@ -1369,7 +1349,7 @@ openerp.mail = function(session) {
                     'context': {
                         'default_model': message.model || this.context.default_model,
                         'default_res_id': message.res_id || this.context.default_res_id,
-                        'default_ancestor_id': this.id },
+                        'default_parent_id': this.id },
                 });
 
                 // add object on array and DOM
@@ -1703,7 +1683,11 @@ openerp.mail = function(session) {
                 action_from: 'mail.ThreadComposeMessage',
                 views: [[false, 'form']],
                 target: 'new',
-                context: this.options.context,
+                context: _.extend(this.options.context, {
+                    'default_model': this.context.default_model,
+                    'default_res_id': this.context.default_res_id,
+                    'default_content_subtype': 'html',
+                }),
             };
             session.client.action_manager.do_action(action);
         },
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a361daae154..8e9d07e0657 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -57,7 +57,7 @@
                 <t t-call="HiddenInputFile">
                     <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
                     <t t-set="fileupload_action">/web/binary/upload_attachment</t>
-                    <input type="hidden" name="model" value="mail.message"/>
+                    <input type="hidden" name="model" value="mail.compose.message"/>
                     <input type="hidden" name="id" value="0"/>
                     <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
                 </t>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 4d3f3934392..1f00ed419a2 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -16,14 +16,14 @@
                         <!-- visible wizard -->
                         <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
                                 context="{'force_email':True}"
-                                on_change="onchange_partner_ids(partner_ids)"/>
+                                on_change="onchange_partner_ids(partner_ids)" required="1"/>
                         <field name="subject" placeholder="Subject..."
-                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>/>
-                        <field name="attachment_ids" colspan="4" nolabel="1" widget="one2many_binary" blockui="1"/>
-                        <field name="body" colspan="4" nolabel="1"/>
+                                attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                     </group>
+                    <field name="body"/>
+                    <field name="attachment_ids" widget="one2many_binary" blockui="0"/>
                     <footer>
-                        <button string="Send" name="send_mail" type="object" class="oe_highlight"  />
+                        <button string="Send" name="send_mail" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>

From 69a2a3180ae592d7aabd64f00bd14a40437ba378 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 14:56:26 +0200
Subject: [PATCH 058/106] [IMP] mail: name = Emails

bzr revid: chm@openerp.com-20121024125626-2iu172swotalm723
---
 addons/mail/mail_thread_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 5ef5e14b846..d674814e1be 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -39,7 +39,7 @@
         <!-- MENU -->
 
         <!-- Top menu item -->
-        <menuitem name="Mails"
+        <menuitem name="Emails"
           id="mail.mail_feeds_main"
           groups="base.group_user"
           sequence="10"/>

From fc34572ee3bbdfd52f3c5cda21cbcc61729dd3be Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 15:48:19 +0200
Subject: [PATCH 059/106] [IMP] mail: preview image on openchatter

bzr revid: chm@openerp.com-20121024134819-5gf165nf6cc21601
---
 addons/mail/static/src/js/mail.js   | 20 +++++++++++++++++---
 addons/mail/static/src/xml/mail.xml | 21 +++++++++++++++------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8044128cbe7..2fc2861c0d2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -175,7 +175,6 @@ openerp.mail = function(session) {
             } else {
                 this.$render_compact.hide();
             }
-
             this.bind_events();
         },
 
@@ -198,7 +197,6 @@ openerp.mail = function(session) {
         /* when a user click on the upload button, send file read on_attachment_loaded
         */
         on_attachment_change: function (event) {
-            console.log('attach');
             event.stopPropagation();
             var self = this;
             var $target = $(event.target);
@@ -347,7 +345,6 @@ openerp.mail = function(session) {
 
         /*post a message and fetch the message*/
         on_message_post: function (body) {
-            console.log('post');
             var self = this;
 
             if (! body) {
@@ -639,18 +636,35 @@ openerp.mail = function(session) {
             }
             for (var l in this.attachment_ids) {
                 var attach = this.attachment_ids[l];
+                if((attach.filename || attach.name).match(/[.](jpg|jpg|gif|png|tif|svg)$/i)) {
+                    attach.is_image = true;
+
+                }
                 attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
             }
+
         },
         
         start: function() {
             this._super.apply(this, arguments);
             this.expender();
             this.$el.hide().fadeIn(750);
+            this.resize_img();
             this.bind_events();
             this.create_thread();
         },
 
+        resize_img: function() {
+            this.$("img").load(function() {
+                var h = $(this).height();
+                var w = $(this).width();
+                if( h > 100 || w >100 ) {
+                    var ratio = 100 / (h > w ? h : w);
+                    $(this).attr("width", parseInt( w*ratio )).attr("height", parseInt( h*ratio ));
+                }
+            });
+        },
+
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 3cd43996569..1e3c699e39a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -70,8 +70,8 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <div t-attf-class="oe_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
-            <t t-foreach="widget.attachment_ids" t-as="attachment">
+        <span t-attf-class="oe_msg_attachments">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
                 <div class="oe_attachment">
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
@@ -79,15 +79,24 @@
                         </div>
                         <t t-raw="attachment.name || attachment.filename"/>
                     </span>
-                    <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
-                        <t t-raw="attachment.name || attachment.filename"/>
-                    </a>
+                    <t t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)">
+                        <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
+                            <t t-raw="attachment.name || attachment.filename"/>
+                        </a>
+                    </t>
                     <t t-if="(widget.show_delete_attachment and (!attachment.upload or attachment.percent_loaded&gt;=100))">
                         <a class="oe_right oe_mail_attachment_delete oe_e" title="Delete this attachment" t-attf-data-id="{attachment.id}">[</a>
                     </t>
                 </div>
             </t>
-        </div>
+        </span>
+        <span t-attf-class="oe_msg_images">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_image">
+                <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
+                    <img t-if="attachment.is_image" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-att-src="attachment.url"/>
+                </a>
+            </t>
+        </span>
     </t>
 
     <t t-name="mail.thread.message.private">

From 4ce75bb9bdfe805d479ccc25060d8bcc6b0ace01 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 16:09:10 +0200
Subject: [PATCH 060/106] [IMP] mail: preview documents (doc, pdf...) on
 openchatter

bzr revid: chm@openerp.com-20121024140910-88gj3t5efhc7pzzi
---
 addons/mail/static/src/css/mail.css |  3 +++
 addons/mail/static/src/js/mail.js   |  7 ++++++-
 addons/mail/static/src/xml/mail.xml | 10 +++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index a1f2b5c4910..4b412000a54 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -187,6 +187,9 @@
 .openerp .oe_mail .oe_msg_attachments .oe_attachment:nth-child(even){
     background: #F4F5FA;
 }
+.openerp .oe_mail .oe_msg_images {
+    display: block;
+}
 .openerp .oe_mail .oe_msg_footer button{
     display: inline;
     height: 24px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2fc2861c0d2..35fe012e054 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -636,11 +636,16 @@ openerp.mail = function(session) {
             }
             for (var l in this.attachment_ids) {
                 var attach = this.attachment_ids[l];
+                attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
+                
                 if((attach.filename || attach.name).match(/[.](jpg|jpg|gif|png|tif|svg)$/i)) {
                     attach.is_image = true;
 
                 }
-                attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
+                if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) {
+                    attach.is_document = true;
+                    attach.url_escape = escape(attach.url);
+                }
             }
 
         },
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1e3c699e39a..59ffc93bdf4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -71,7 +71,7 @@
         -->
     <t t-name="mail.thread.message.attachments">
         <span t-attf-class="oe_msg_attachments">
-            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image and !attachment.is_document">
                 <div class="oe_attachment">
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
@@ -97,6 +97,14 @@
                 </a>
             </t>
         </span>
+        <span t-attf-class="oe_msg_document">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_document">
+                <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
+                    <t t-raw="attachment.name || attachment.filename"/>
+                </a>
+                <iframe t-attf-src="http://docs.google.com/viewer?url=#{ attachment.url_escape }&amp;embedded=true" width="600" height="400" style="border: none;"></iframe>
+            </t>
+        </span>
     </t>
 
     <t t-name="mail.thread.message.private">

From b1122deb389982e7e3e0781c8aab431c54b4ae9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 24 Oct 2012 16:18:06 +0200
Subject: [PATCH 061/106] [IMP] mail: added _search override on mail_message,
 to filter the results of a search according to our custom rules. Added some
 tests.

bzr revid: tde@openerp.com-20121024141806-8iayf7cz2ndxyz2l
---
 addons/mail/mail_message.py                  | 65 +++++++++++++++++++-
 addons/mail/security/ir.model.access.csv     |  5 +-
 addons/mail/tests/test_mail_access_rights.py | 36 +++++++++--
 3 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index fdcc1e73ec5..dc7cbbea4af 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -433,7 +433,7 @@ class mail_message(osv.Model):
     #     return attachment_list
 
     #------------------------------------------------------
-    # Email api
+    # mail_message internals
     #------------------------------------------------------
 
     def init(self, cr):
@@ -441,6 +441,61 @@ class mail_message(osv.Model):
         if not cr.fetchone():
             cr.execute("""CREATE INDEX mail_message_model_res_id_idx ON mail_message (model, res_id)""")
 
+    def _search(self, cr, uid, args, offset=0, limit=None, order=None,
+        context=None, count=False, access_rights_uid=None):
+        """ Override that adds specific access rights of mail.message, to remove
+            ids uid could not see according to our custom rules. Please refer
+            to check_access_rule for more details about those rules.
+
+            After having received ids of a classic search, keep only:
+            - if author_id == pid, uid is the author, OR
+            - a notification (id, pid) exists, uid has been notified, OR
+            - uid have read access to the related document is model, res_id
+            - otherwise: remove the id
+        """
+        # Rules do not apply to administrator
+        if uid == SUPERUSER_ID:
+            return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
+            context=context, count=count, access_rights_uid=access_rights_uid)
+        # Perform a super with count as False, to have the ids, not a counter
+        ids = super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
+            context=context, count=False, access_rights_uid=access_rights_uid)
+        if not ids and count:
+            return 0
+        elif not ids:
+            return ids
+
+        author_ids = set([])
+        partner_ids = set([])
+        allowed_ids = set([])
+        model_ids = {}
+
+        pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'])['partner_id'][0]
+        messages = super(mail_message, self).read(cr, uid, ids, ['author_id', 'model', 'res_id', 'partner_ids'])
+        for message in messages:
+            if message.get('author_id') and message.get('author_id')[0] == pid:
+                author_ids.add(message.get('id'))
+            elif pid in message.get('partner_ids'):
+                partner_ids.add(message.get('id'))
+            elif message.get('model') and message.get('res_id'):
+                model_ids.setdefault(message.get('model'), {}).setdefault(message.get('res_id'), set()).add(message.get('id'))
+        # print '_search', ids, author_ids, partner_ids, model_ids
+
+        model_access_obj = self.pool.get('ir.model.access')
+        for doc_model, doc_dict in model_ids.iteritems():
+            # print '>>>>', doc_model, doc_dict
+            if not model_access_obj.check(cr, uid, doc_model, 'read', False):
+                continue
+            doc_ids = doc_dict.keys()
+            allowed_doc_ids = self.pool.get(doc_model).search(cr, uid, [('id', 'in', doc_ids)], context=context)
+            allowed_ids |= set([message_id for allowed_doc_id in allowed_doc_ids for message_id in doc_dict[allowed_doc_id]])
+
+        final_ids = author_ids | partner_ids | allowed_ids
+        if count:
+            return len(final_ids)
+        else:
+            return list(final_ids)
+
     def check_access_rule(self, cr, uid, ids, operation, context=None):
         """ Access rules of mail.message:
             - read: if
@@ -449,7 +504,7 @@ class mail_message(osv.Model):
                 - I can read the related document if res_model, res_id
                 - Otherwise: raise
             - create: if
-                - I am in the document message_follower_ids OR
+                - I am in the document message_follower_ids if res_model, res_id OR
                 - I can write on the related document if res_model, res_id OR
                 - I create a private message (no model, no res_id)
                 - Otherwise: raise
@@ -568,6 +623,10 @@ class mail_message(osv.Model):
             self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
         return super(mail_message, self).unlink(cr, uid, ids, context=context)
 
+    #------------------------------------------------------
+    # Messaging API
+    #------------------------------------------------------
+
     def _notify_followers(self, cr, uid, newid, message, context=None):
         """ Add the related record followers to the destination partner_ids.
         """
@@ -606,7 +665,7 @@ class mail_message(osv.Model):
         self.pool.get('mail.notification')._notify(cr, uid, newid, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
-        """Overridden to avoid duplicating fields that are unique to each email"""
+        """ Overridden to avoid duplicating fields that are unique to each email """
         if default is None:
             default = {}
         default.update(message_id=False, headers=False)
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index c609667c26e..52c6c605109 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -2,6 +2,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mail_message_all,mail.message.all,model_mail_message,,1,0,1,0
 access_mail_message_group_user,mail.message.group.user,model_mail_message,base.group_user,1,1,1,1
 access_mail_mail_all,mail.mail.all,model_mail_mail,,0,0,1,0
+access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0
 access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1,1
 access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0
 access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1
@@ -12,6 +13,6 @@ access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
 access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0
 access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
 access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
-access_mail_message_subtype,mail.message.subtype,model_mail_message_subtype,,1,1,1,1
-access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0
+access_mail_message_subtype_all,mail.message.subtype.all,model_mail_message_subtype,,1,0,0,0
 access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1
+access_mail_favorite_all,mail.favorite.all,model_mail_favorite,,1,1,1,1
\ No newline at end of file
diff --git a/addons/mail/tests/test_mail_access_rights.py b/addons/mail/tests/test_mail_access_rights.py
index 544191205b8..bcf499de799 100644
--- a/addons/mail/tests/test_mail_access_rights.py
+++ b/addons/mail/tests/test_mail_access_rights.py
@@ -51,7 +51,37 @@ class test_mail_access_rights(test_mail.TestMailMockups):
         self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
         self.partner_raoul_id = self.user_raoul.partner_id.id
 
-    def test_00_mail_message_read_access_rights(self):
+    def test_00_mail_message_search_access_rights(self):
+        """ Test mail_message search override about access rights. """
+        cr, uid, group_pigs_id = self.cr, self.uid, self.group_pigs_id
+        partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
+        user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
+
+        # Data: Birds group, private
+        group_birds_id = self.mail_group.create(self.cr, self.uid, {'name': 'Birds', 'public': 'private'})
+        # Data: raoul is member of Pigs
+        self.mail_group.message_subscribe(cr, uid, [group_pigs_id], [partner_raoul_id])
+        # Data: various author_ids, partner_ids, documents
+        msg_id1 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A'})
+        msg_id2 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A+B', 'partner_ids': [(6, 0, [partner_bert_id])]})
+        msg_id3 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A Pigs', 'model': 'mail.group', 'res_id': group_pigs_id})
+        msg_id4 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A+B Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'partner_ids': [(6, 0, [partner_bert_id])]})
+        msg_id5 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A+R Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'partner_ids': [(6, 0, [partner_raoul_id])]})
+        msg_id6 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A Birds', 'model': 'mail.group', 'res_id': group_birds_id})
+        msg_id7 = self.mail_message.create(cr, user_bert_id, {'subject': 'Test', 'body': 'B'})
+        msg_id8 = self.mail_message.create(cr, user_bert_id, {'subject': 'Test', 'body': 'B+R', 'partner_ids': [(6, 0, [partner_raoul_id])]})
+
+        # Test: Bert: 2 messages that have Bert in partner_ids + 2 messages as author
+        msg_ids = self.mail_message.search(cr, user_bert_id, [('subject', 'like', 'Test')])
+        self.assertEqual(set([msg_id2, msg_id4, msg_id7, msg_id8]), set(msg_ids), 'mail_message search failed')
+        # Test: Raoul: 3 messages on Pigs Raoul can read (employee can read group with default values), 0 on Birds (private group)
+        msg_ids = self.mail_message.search(cr, user_raoul_id, [('body', 'like', 'A')])
+        self.assertEqual(set([msg_id3, msg_id4, msg_id5]), set(msg_ids), 'mail_message search failed')
+        # Test: Admin: all messages
+        msg_ids = self.mail_message.search(cr, uid, [('subject', 'like', 'Test')])
+        self.assertEqual(set([msg_id1, msg_id2, msg_id3, msg_id4, msg_id5, msg_id6, msg_id7, msg_id8]), set(msg_ids), 'mail_message search failed')
+
+    def test_05_mail_message_read_access_rights(self):
         """ Test basic mail_message read access rights. """
         cr, uid = self.cr, self.uid
         partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
@@ -98,10 +128,6 @@ class test_mail_access_rights(test_mail.TestMailMockups):
         self.assertRaises(except_orm, self.mail_message.read,
             cr, user_bert_id, message_id)
 
-    def test_05_mail_message_search_access_rights(self):
-        """ Test mail_message search override about access rights. """
-        self.assertTrue(1 == 1, 'Test not implemented, do not replace by return True')
-
     def test_10_mail_flow_access_rights(self):
         """ Test a Chatter-looks alike flow. """
         cr, uid = self.cr, self.uid

From 7b6cc50de71d7708881ff67620301b372c8b404d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 16:41:35 +0200
Subject: [PATCH 062/106] [IMP] mail: filter has attachment

bzr revid: chm@openerp.com-20121024144135-frzyxty5iiksqtg4
---
 addons/mail/mail_message_view.xml | 3 +++
 addons/mail/static/src/js/mail.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 4677beee511..efd1c581fe5 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -63,6 +63,9 @@
                     <filter string="Comments"
                             name="comments" help="Comments"
                             domain="[('type', '=', 'comment')]"/>
+                    <filter string="Has attachments"
+                            name="attachments"
+                            domain="[('attachment_ids', '!=', False)]"/>
                     <filter string="Notifications"
                             name="notifications" help="Notifications"
                             domain="[('type', '=', 'notification')]"/>
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 35fe012e054..a44941ece0b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -637,14 +637,14 @@ openerp.mail = function(session) {
             for (var l in this.attachment_ids) {
                 var attach = this.attachment_ids[l];
                 attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
-                
+
                 if((attach.filename || attach.name).match(/[.](jpg|jpg|gif|png|tif|svg)$/i)) {
                     attach.is_image = true;
 
                 }
                 if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) {
                     attach.is_document = true;
-                    attach.url_escape = escape(attach.url);
+                    attach.url_escape = escape(encodeURI(attach.url));
                 }
             }
 

From 4f65723662fe8c80c081ad0e362895601a0a78ef Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 16:43:50 +0200
Subject: [PATCH 063/106] [IMP] mail: try to fix encodeURI for document loader

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

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index a44941ece0b..db50b96560e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -644,7 +644,7 @@ openerp.mail = function(session) {
                 }
                 if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) {
                     attach.is_document = true;
-                    attach.url_escape = escape(encodeURI(attach.url));
+                    attach.url_escape = encodeURIComponent(attach.url);
                 }
             }
 

From 8d9fdcc3526f1aaaf394f571e5fed8169f459cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 24 Oct 2012 17:20:43 +0200
Subject: [PATCH 064/106] [IMP] mail: followers css + widget integration in
 inbox and formview

bzr revid: fva@openerp.com-20121024152043-q5j7hpa4rur39k03
---
 addons/mail/static/src/css/mail.css           | 82 +++++++++++++++++--
 addons/mail/static/src/js/mail.js             |  4 +-
 addons/mail/static/src/js/mail_followers.js   | 34 ++++----
 addons/mail/static/src/xml/mail.xml           | 14 +---
 addons/mail/static/src/xml/mail_followers.xml | 46 +++++------
 5 files changed, 117 insertions(+), 63 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index a1f2b5c4910..c4d1b6e2c28 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,6 +1,3 @@
-.oe_mail_wall_threads{
-    padding: 16px;
-}
 
 /* ------------ MAIL WIDGET --------------- */
 .openerp .oe_mail, .openerp .oe_mail *{
@@ -9,7 +6,7 @@
 .openerp .oe_mail {
     display: inline-block;
     position: relative;
-    width: 740px;
+    width: 720px;
     margin: 0px;
 }
 .openerp .oe_mail .oe_thread{
@@ -27,6 +24,7 @@
     border-radius: 2px;
     margin-bottom: 2px;
     min-height: 40px;
+    border: solid 1px rgba(0,0,0,0.03);
 }
 .openerp .oe_mail .oe_msg_indented{
     background: #FFF;
@@ -58,7 +56,6 @@
     margin-left: 40px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
-    height: 16px;
     padding-left: 4px;
     overflow: hidden;
     font-size: 11px;
@@ -69,9 +66,6 @@
     opacity: 1;
     -webkit-transition: opacity 0.2s linear;
 }
-.openerp .oe_mail .oe_msg.oe_msg_composer .oe_msg_footer{
-    height: auto;
-}
 .openerp .oe_mail .oe_msg .oe_msg_content{
     display: block;
     overflow: hidden;
@@ -248,3 +242,75 @@
     opacity: 1;
     -webkit-transition: opacity 0.2s linear;
 }
+
+/* ---------------- FOLLOWERS ------------------ */
+
+.openerp .oe_followers{
+    position: relative;
+    display: inline-block;
+    padding-top: 4px;
+    width: 120px;
+    float: right;
+}
+
+/*  a) THE FOLLOW BUTTON */
+
+.openerp .oe_followers button.oe_follower{
+    display: block;
+    text-align: center;
+    width:100%;
+}
+.openerp .oe_followers button.oe_follower.oe_following{
+    background-color: #3465A4;
+    background-image: -webkit-linear-gradient(top, #729FCF, #3465A4);
+    color: white;
+}
+
+.openerp .oe_followers button.oe_follower .oe_follow, 
+.openerp .oe_followers button.oe_follower .oe_unfollow, 
+.openerp .oe_followers button.oe_follower .oe_following{
+    display: none;
+}
+/*  a.1) when following, show 'following' */
+.openerp .oe_followers button.oe_follower.oe_following .oe_following{
+    display: inline;
+}
+/*  a.2) when following and hovering, show 'unfollow' */
+.openerp .oe_followers button.oe_follower.oe_following:hover .oe_following{
+    display: none;
+}
+.openerp .oe_followers button.oe_follower.oe_following:hover .oe_unfollow{
+    display: inline;
+}
+/*  a.3) when not following  show 'follow' */
+.openerp .oe_followers button.oe_follower.oe_notfollow .oe_follow{
+    display: inline;
+}
+
+.openerp .oe_followers .oe_subtype_list{
+    margin-bottom: 4px;
+}
+
+/*  b) THE FOLLOWERS */
+.openerp .oe_followers .oe_follower_title{
+    margin-top: 4px;
+}
+.openerp .oe_followers .oe_partner {
+    height: 32px;
+    overflow: hidden;
+}
+.openerp .oe_followers .oe_partner img{
+    width: 32px;
+    margin-right:4px;
+    border-radius: 2px;
+}
+
+/* ----------- FORM INTEGRATION ------------ */
+
+            /* Nothing to do yay! */
+
+/* ----------- INBOX INTEGRATION ----------- */
+
+.openerp .oe_mail_wall .oe_mail{
+    margin: 16px;
+}
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2890e9eda6e..888af67857a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1560,7 +1560,7 @@ openerp.mail = function(session) {
                 }
             );
 
-            return this.root.appendTo( this.$('.oe_mail_wall_threads:first') );
+            return this.root.replace(this.$('.oe_mail-placeholder'));
         },
     });
 
@@ -1658,7 +1658,7 @@ openerp.mail = function(session) {
                 }
             );
 
-            return this.root.appendTo( this.$('.oe_mail_wall_threads:first') );
+            return this.root.replace(this.$('.oe_mail-placeholder'));
         },
 
         bind_events: function(){
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index f08991be2cc..bf913df0b04 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -24,10 +24,10 @@ openerp_mail_followers = function(session, mail) {
 
         init: function() {
             this._super.apply(this, arguments);
-            this.options.image = this.node.attrs.image || 'image_small';
-            this.options.title = this.node.attrs.title || 'Followers';
-            this.options.comment = this.node.attrs.help || false;
-            this.options.displayed_nb = this.node.attrs.displayed_nb || 10;
+            this.image = this.node.attrs.image || 'image_small';
+            this.title = this.node.attrs.title || 'Followers';
+            this.comment = this.node.attrs.help || false;
+            this.displayed_nb = this.node.attrs.displayed_nb || 10;
             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');
@@ -61,7 +61,7 @@ openerp_mail_followers = function(session, mail) {
                     self.do_unfollow();
             });
             // event: click on a subtype, that (un)subscribe for this subtype
-            this.$el.on('click', 'ul.oe_subtypes input', self.do_update_subscription);
+            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', function (event) {
                 action = {
@@ -119,16 +119,16 @@ openerp_mail_followers = function(session, mail) {
         /* Display generic info about follower, for people not having access to res_partner */
         display_generic: function () {
             var self = this;
-            var node_user_list = this.$('ul.oe_mail_followers_display').empty();
+            var node_user_list = this.$('.oe_follower_list').empty();
             // format content: Followers (You and 0 other) // Followers (3)
-            var content = this.options.title;
+            var content = this.title;
             if (this.message_is_follower) {
                 content += ' (You and ' + (this.get('value').length-1) + ' other)';
             }
             else {
                 content += ' (' + this.get('value').length + ')'
             }
-            this.$('div.oe_mail_recthread_followers h4').html(content);
+            this.$('.oe_follower_title').html(content);
         },
 
         /** Display the followers */
@@ -137,16 +137,16 @@ openerp_mail_followers = function(session, mail) {
             records = records || [];
             this.message_is_follower = this.set_is_follower(records);
             // clean and display title
-            var node_user_list = this.$('ul.oe_mail_followers_display').empty();
-            this.$('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
+            var node_user_list = this.$('.oe_follower_list').empty();
+            this.$('.oe_follower_title').html(this.title + ' (' + records.length + ')');
             // truncate number of displayed followers
-            truncated = records.splice(0, this.options.displayed_nb);
+            truncated = records.splice(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})).appendTo(node_user_list);
             });
-            if (truncated.length < records.length) {
-                $('<li>And ' + (records.length - truncated.length) + ' more.</li>').appendTo(node_user_list);
+            if (truncated.length < records.length) { //FIXME USE A TEMPLATE !
+                $('<div class="oe_partner">And ' + (records.length - truncated.length) + ' more.</div>').appendTo(node_user_list);
             }
         },
 
@@ -172,7 +172,7 @@ openerp_mail_followers = function(session, mail) {
 
         /** Fetch subtypes, only if current user is follower */
         fetch_subtypes: function () {
-            var subtype_list_ul = this.$('.oe_subtypes').empty();
+            var subtype_list_ul = this.$('.oe_subtype_list').empty();
             if (! this.message_is_follower) return;
             var context = new session.web.CompoundContext(this.build_context(), {});
             this.ds_model.call('message_get_subscription_data', [[this.view.datarecord.id], context]).pipe(this.proxy('display_subtypes'));
@@ -181,12 +181,12 @@ openerp_mail_followers = function(session, mail) {
         /** Display subtypes: {'name': default, followed} */
         display_subtypes:function (data) {
             var self = this;
-            var subtype_list_ul = this.$('.oe_subtypes');
+            var subtype_list_ul = this.$('.oe_subtype_list');
             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.$('ul.oe_subtypes') );
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') );
             });
         },
 
@@ -209,7 +209,7 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
 
             var checklist = new Array();
-            _(this.$('.oe_mail_recthread_actions input[type="checkbox"]')).each(function (record) {
+            _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
                 if ($(record).is(':checked')) {
                     checklist.push(parseInt($(record).data('id')));
                 }
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 125376deb57..e1e272f1dd4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -153,11 +153,7 @@
             </tr>
           </tbody>
         </table>
-        <!-- placeholder for the wall threads -->
-        <div class="oe_mail_wall_threads"/>
-        <div class="oe_mail_wall_aside">
-                <!-- contains currently nothing -->
-        </div>
+        <div class="oe_mail-placeholder"></div>
     </div>
 
     <!--
@@ -172,12 +168,10 @@
         Template used to display the communication history in documents
         form view.
         -->
-    <div t-name="mail.record_thread" class="oe_mail_record_wall">
-        <!-- <h4>History and Comments</h4> -->
-        <div class="oe_mail_wall_threads">
-            <!-- contains the document thread -->
+    <span t-name="mail.record_thread" class="oe_record_thread">
+        <div class="oe_mail-placeholder">
         </div>
-    </div>
+    </span>
 
     <t t-name="mail.thread">
         <div t-attf-class="oe_thread #{widget.root?'oe_root_thread':''}"/>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 87b49579100..02796c5d80a 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -5,51 +5,45 @@
         followers main template
         Template used to display the followers, the actions and the subtypes in a record.
         -->
-    <div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override">
-        <div class="oe_mail_recthread_actions">
-            <div class="oe_mail_subtypes">
-                <button type="button" class="oe_follower oe_notfollow">
-                    <span class="oe_follow">Follow</span>
-                    <span class="oe_unfollow">Unfollow</span>
-                    <span class="oe_following">Following</span>
-                </button>
-            </div>
-            <div class="oe_recthread_subtypes">
-                <ul class="oe_subtypes"></ul>
-            </div>
+    <div t-name="mail.followers" class="oe_followers">
+        <div class="oe_actions">
+            <button type="button" class="oe_follower oe_notfollow">
+                <span class="oe_follow">Follow</span>
+                <span class="oe_unfollow">Unfollow</span>
+                <span class="oe_following">Following</span>
+            </button>
+            <div class="oe_subtype_list"></div>
         </div>
-        <t t-if="widget.options.comment">
-            <h5 class="oe_grey"><t t-raw="widget.options.comment"/></h5>
+        <t t-if="widget.comment">
+            <h5 class="oe_comment"><t t-raw="widget.comment"/></h5>
         </t>
-        <div class="oe_mail_recthread_followers">
-            <button type="button" class="oe_invite"><span>Invite</span></button>
-            <t t-if="widget.options.title">
-                <h4><t t-raw="widget.options.title"/></h4>
-            </t>
-            <ul class="oe_mail_followers_display"></ul>
-        </div>
+        <button type="button" class="oe_invite"><span>Invite</span></button>
+        <t t-if="widget.title">
+            <h4 class='oe_follower_title'><t t-raw="widget.title"/></h4>
+        </t>
+        <div class="oe_follower_list"></div>
     </div>
 
     <!--
         followers.partner template
         Template used to display a partner following the record
         -->
-    <li t-name="mail.followers.partner">
+    <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>
-    </li>\
+    </div>
     
     <!--
         followers.subtype template
         Template used to display message subtypes of a follower subscription
     -->
-    <li t-name="mail.followers.subtype">
-        <table width="50%">
+    <t t-name="mail.followers.subtype">
+        <table class='oe_subtype'>
             <tr>
                 <td><label t-att-for="'input_mail_followers_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_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
             </tr>
         </table>
-    </li>
+    </t>
 
 </template>

From 4818ad676f37cac9e1a13c36f01de6d0752769b4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 17:27:11 +0200
Subject: [PATCH 065/106] [IMP] mail: for security,  document loader is in
 comment

bzr revid: chm@openerp.com-20121024152711-igcz0seor2if6ist
---
 addons/mail/static/src/js/mail.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index db50b96560e..03c0b21da20 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -640,12 +640,13 @@ openerp.mail = function(session) {
 
                 if((attach.filename || attach.name).match(/[.](jpg|jpg|gif|png|tif|svg)$/i)) {
                     attach.is_image = true;
-
-                }
-                if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) {
-                    attach.is_document = true;
-                    attach.url_escape = encodeURIComponent(attach.url);
+                    attach['url'] = mail.ChatterUtils.get_image(this.session, 'ir.attachment', 'datas', attach.id); 
                 }
+                //To do
+                // if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) {
+                //     attach.is_document = true;
+                //     attach.url_escape = encodeURIComponent(attach.url);
+                // }
             }
 
         },

From 25084cb88c86e25bc81f4a45046780f48ee42c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 24 Oct 2012 17:53:29 +0200
Subject: [PATCH 066/106] [CLEAN] mail_message: cleaned a bit methods about
 access rules.

bzr revid: tde@openerp.com-20121024155329-8rf0610r69ay0c93
---
 addons/mail/mail_message.py | 76 +++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index dc7cbbea4af..a649c04ad29 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -465,13 +465,11 @@ class mail_message(osv.Model):
         elif not ids:
             return ids
 
-        author_ids = set([])
-        partner_ids = set([])
-        allowed_ids = set([])
+        pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'])['partner_id'][0]
+        author_ids, partner_ids, allowed_ids = set([]), set([]), set([])
         model_ids = {}
 
-        pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'])['partner_id'][0]
-        messages = super(mail_message, self).read(cr, uid, ids, ['author_id', 'model', 'res_id', 'partner_ids'])
+        messages = super(mail_message, self).read(cr, uid, ids, ['author_id', 'model', 'res_id', 'partner_ids'], context=context)
         for message in messages:
             if message.get('author_id') and message.get('author_id')[0] == pid:
                 author_ids.add(message.get('id'))
@@ -499,20 +497,20 @@ class mail_message(osv.Model):
     def check_access_rule(self, cr, uid, ids, operation, context=None):
         """ Access rules of mail.message:
             - read: if
-                - notification exist (I receive pushed message) OR
-                - author_id = pid (I am the author) OR
-                - I can read the related document if res_model, res_id
-                - Otherwise: raise
+                - author_id == pid, uid is the author, OR
+                - mail_notification (id, pid) exists, uid has been notified, OR
+                - uid have read access to the related document if model, res_id
+                - otherwise: raise
             - create: if
-                - I am in the document message_follower_ids if res_model, res_id OR
-                - I can write on the related document if res_model, res_id OR
-                - I create a private message (no model, no res_id)
-                - Otherwise: raise
+                - no model, no res_id, I create a private message
+                - pid in message_follower_ids if model, res_id OR
+                - uid have write access on the related document if model, res_id, OR
+                - otherwise: raise
             - write: if
-                - I can write on the related document if res_model, res_id
+                - uid has write access on the related document if model, res_id
                 - Otherwise: raise
             - unlink: if
-                - I can write on the related document if res_model, res_id
+                - uid has write access on the related document if model, res_id
                 - Otherwise: raise
         """
         if uid == SUPERUSER_ID:
@@ -522,15 +520,25 @@ class mail_message(osv.Model):
         partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
 
         # Read mail_message.ids to have their values
-        model_record_ids = {}
         message_values = dict.fromkeys(ids)
+        model_record_ids = {}
         cr.execute('SELECT DISTINCT id, model, res_id, author_id FROM "%s" WHERE id = ANY (%%s)' % self._table, (ids,))
         for id, rmod, rid, author_id in cr.fetchall():
             message_values[id] = {'res_model': rmod, 'res_id': rid, 'author_id': author_id}
             if rmod:
-                model_record_ids.setdefault(rmod, set()).add(rid)
+                model_record_ids.setdefault(rmod, dict()).setdefault(rid, set()).add(id)
 
-        # Read: Check for received notifications -> could become an ir.rule, but not till we do not have a many2one variable field
+        # Author condition, for read and create (private message) -> could become an ir.rule, but not till we do not have a many2one variable field
+        if operation == 'read':
+            author_ids = [mid for mid, message in message_values.iteritems()
+                if message.get('author_id') and message.get('author_id') == partner_id]
+        elif operation == 'create':
+            author_ids = [mid for mid, message in message_values.iteritems()
+                if not message.get('model') and not message.get('res_id')]
+        else:
+            author_ids = []
+
+        # Notification condition, for read (check for received notifications and create (in message_follower_ids)) -> could become an ir.rule, but not till we do not have a many2one variable field
         if operation == 'read':
             not_obj = self.pool.get('mail.notification')
             not_ids = not_obj.search(cr, SUPERUSER_ID, [
@@ -538,38 +546,24 @@ class mail_message(osv.Model):
                 ('message_id', 'in', ids),
             ], context=context)
             notified_ids = [notification.message_id.id for notification in not_obj.browse(cr, SUPERUSER_ID, not_ids, context=context)]
-        else:
-            notified_ids = []
-        # Read: Check messages you are author -> could become an ir.rule, but not till we do not have a many2one variable field
-        if operation == 'read':
-            author_ids = [mid for mid, message in message_values.iteritems()
-                if message.get('author_id') and message.get('author_id') == partner_id]
-        # Create: Check messages you create that are private messages -> ir.rule ?
         elif operation == 'create':
-            author_ids = [mid for mid, message in message_values.iteritems()
-                if not message.get('model') and not message.get('res_id')]
-        else:
-            author_ids = []
-
-        # Create: Check message_follower_ids
-        if operation == 'create':
-            doc_follower_ids = []
-            for model, mids in model_record_ids.items():
+            notified_ids = []
+            for doc_model, doc_dict in model_record_ids.items():
                 fol_obj = self.pool.get('mail.followers')
                 fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
-                    ('res_model', '=', model),
-                    ('res_id', 'in', list(mids)),
+                    ('res_model', '=', doc_model),
+                    ('res_id', 'in', list(doc_dict.keys())),
                     ('partner_id', '=', partner_id),
                     ], context=context)
                 fol_mids = [follower.res_id for follower in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)]
-                doc_follower_ids += [mid for mid, message in message_values.iteritems()
-                    if message.get('res_model') == model and message.get('res_id') in fol_mids]
+                notified_ids += [mid for mid, message in message_values.iteritems()
+                    if message.get('res_model') == doc_model and message.get('res_id') in fol_mids]
         else:
-            doc_follower_ids = []
+            notified_ids = []
 
         # Calculate remaining ids, and related model/res_ids
         model_record_ids = {}
-        other_ids = set(ids).difference(set(notified_ids), set(author_ids), set(doc_follower_ids))
+        other_ids = set(ids).difference(set(author_ids), set(notified_ids))
         for id in other_ids:
             if message_values[id]['res_model']:
                 model_record_ids.setdefault(message_values[id]['res_model'], set()).add(message_values[id]['res_id'])
@@ -589,7 +583,7 @@ class mail_message(osv.Model):
                 if message.get('res_model') == model and message.get('res_id') in mids]
 
         # Calculate remaining ids: if not void, raise an error
-        other_ids = set(ids).difference(set(notified_ids), set(author_ids), set(doc_follower_ids), set(document_related_ids))
+        other_ids = other_ids - set(document_related_ids)
         if not other_ids:
             return
         raise orm.except_orm(_('Access Denied'),

From d46263525340104895e4d2439ec7e581545a63f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 09:50:36 +0200
Subject: [PATCH 067/106] [FIX] mail_thread: removed hack 'posting on
 res.partner without thread_id is posting on its own partner -> please avoid
 having hacks without an explanation about why it is here. We will see if this
 changes something. Also fixed parent_id given to the message_read that
 follows the message_post.

bzr revid: tde@openerp.com-20121025075036-tsqen9c10ft1er0l
---
 addons/mail/mail_thread.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 04da686b49d..094cebdfdf1 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -692,14 +692,10 @@ class mail_thread(osv.AbstractModel):
     def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
                         subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
         # TDE FIXME: body is plaintext: convert it into html
-        # when writing on res.partner, without specific thread_id -> redirect to the user's partner
-        if self._name == 'res.partner' and not thread_id:
-            thread_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
-
         new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
                         subtype=subtype, parent_id=parent_id, context=context)
 
-        # Chatter: attachments linked to the document (not done JS-side), load the message
+        # HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
         if attachments:
             ir_attachment = self.pool.get('ir.attachment')
             mail_message = self.pool.get('mail.message')
@@ -708,7 +704,7 @@ class mail_thread(osv.AbstractModel):
                 ir_attachment.write(cr, SUPERUSER_ID, attachment_ids, {'res_model': self._name, 'res_id': thread_id}, context=context)
                 mail_message.write(cr, SUPERUSER_ID, [new_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]}, context=context)
 
-        new_message = self.pool.get('mail.message').message_read(cr, uid, [new_message_id], context=context)
+        new_message = self.pool.get('mail.message').message_read(cr, uid, [new_message_id], parent_id=parent_id, context=context)
         return new_message
 
     #------------------------------------------------------

From 12a3bacf8ca65b4060d2108c1b9abe751f18ca9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 09:51:10 +0200
Subject: [PATCH 068/106] [FIX] message_read: giving ids is now just a way to
 avoid using the domain; everything else is the same.

bzr revid: tde@openerp.com-20121025075110-3re19dkvyxix8q76
---
 addons/mail/mail_message.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index a649c04ad29..c6895c3acc1 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -352,7 +352,7 @@ class mail_message(osv.Model):
         except (orm.except_orm, osv.except_osv):
             return False
 
-    def message_read(self, cr, uid, ids=False, domain=None, message_unload_ids=None, thread_level=0, context=None, parent_id=False, limit=None):
+    def message_read(self, cr, uid, ids=None, domain=None, message_unload_ids=None, thread_level=0, context=None, parent_id=False, limit=None):
         """ Read messages from mail.message, and get back a list of structured
             messages to be displayed as discussion threads. If IDs is set,
             fetch these records. Otherwise use the domain to fetch messages.
@@ -385,16 +385,10 @@ class mail_message(osv.Model):
         read_messages = {}
         message_list = []
 
-        # specific IDs given: fetch those ids and return directly the message list
-        if ids:
-            for message in self.read(cr, uid, ids, self._message_read_fields, context=context):
-                message_list.append(self._message_get_dict(cr, uid, message, context=context))
-            message_list = sorted(message_list, key=lambda k: k['id'])
-            return message_list
-
         # TDE FIXME: check access rights on search are implemented for mail.message
-        # fetch messages according to the domain, add their parents if uid has access to
-        ids = self.search(cr, uid, domain, context=context, limit=limit)
+        # no specific IDS given: fetch messages according to the domain, add their parents if uid has access to
+        if ids is None:
+            ids = self.search(cr, uid, domain, context=context, limit=limit)
         for message in self.read(cr, uid, ids, self._message_read_fields, context=context):
             # if not in tree and not in message_loaded list
             if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:

From 3e4d6ad44066690bc01caab2ed9a893f54be8fb5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 25 Oct 2012 10:05:29 +0200
Subject: [PATCH 069/106] [IMP] mail: oppenchatter hidden attachment

bzr revid: chm@openerp.com-20121025080529-p2dw63h2u2ixyt26
---
 addons/mail/static/src/css/mail.css |  4 +++-
 addons/mail/static/src/js/mail.js   | 35 +++++++++++++++--------------
 addons/mail/static/src/xml/mail.xml | 14 +++---------
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 4b412000a54..0221c36824c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -158,9 +158,11 @@
     padding-top: 2px;
     padding-bottom:6px;
 }
-.openerp .oe_mail .oe_msg_attachments.oe_hidden{
+.openerp .oe_mail .oe_msg_attachments.oe_hidden,
+.openerp .oe_mail .oe_msg_images.oe_hidden{
     margin:0px;
     border: none;
+    display: none;
 }
 .openerp .oe_mail .oe_msg_attachments{
     margin-bottom: 4px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 03c0b21da20..6ba893339fc 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -372,8 +372,9 @@ openerp.mail = function(session) {
                         'mail.mt_comment',
                         this.context.default_parent_id, 
                         attachments,
+                        // (this.options.display_indented_thread - this.thread_level),
                         this.parent_thread.context
-                    ]).then(function(records){
+                    ]).then(function(records) {
                         self.parent_thread.switch_new_message(records);
                         self.on_cancel();
                         //session.web.unblockUI();
@@ -407,7 +408,7 @@ openerp.mail = function(session) {
 
             if(this.$render_expandable.is(':hidden')){
 
-                this.$render_expandable.show();
+                this.$render_expandable.css('display', '');
                 this.$render_compact.hide();
                 this.$render_expandable.find('textarea').focus();
 
@@ -417,7 +418,7 @@ openerp.mail = function(session) {
                 if(!this.$render_expandable.find('textarea').val().match(/\S+/)){
                     this.$render_expandable.hide();
                     if(this.options.show_compact_message && this.show_compact_message) {
-                        this.$render_compact.show();
+                        this.$render_compact.css('display', '');
                     } else {
                         this.$render_compact.hide();
                     }
@@ -434,7 +435,7 @@ openerp.mail = function(session) {
 
         do_show_compact: function() {
             if(this.options.show_compact_message && (!this.$render_expandable || this.$render_expandable.is(':hidden'))) {
-                this.$render_compact.show();
+                this.$render_compact.css('display', '');
             }
             this.show_compact_message = true;
         }
@@ -642,33 +643,29 @@ openerp.mail = function(session) {
                     attach.is_image = true;
                     attach['url'] = mail.ChatterUtils.get_image(this.session, 'ir.attachment', 'datas', attach.id); 
                 }
-                //To do
-                // if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) {
-                //     attach.is_document = true;
-                //     attach.url_escape = encodeURIComponent(attach.url);
-                // }
             }
-
         },
         
         start: function() {
             this._super.apply(this, arguments);
             this.expender();
-            this.$el.hide().fadeIn(750);
+            this.$el.hide().fadeIn(750, function() {$(this).css('display', '');});
             this.resize_img();
             this.bind_events();
             this.create_thread();
+            this.$('.oe_msg_attachments, .oe_msg_images').addClass("oe_hidden");
         },
 
         resize_img: function() {
-            this.$("img").load(function() {
+            var resize = function() {
                 var h = $(this).height();
                 var w = $(this).width();
                 if( h > 100 || w >100 ) {
                     var ratio = 100 / (h > w ? h : w);
                     $(this).attr("width", parseInt( w*ratio )).attr("height", parseInt( h*ratio ));
                 }
-            });
+            };
+            this.$("img").load(resize).each(resize);
         },
 
         /**
@@ -678,8 +675,14 @@ openerp.mail = function(session) {
             var self = this;
 
             // event: click on 'Attachment(s)' in msg
-            this.$('a.oe_msg_view_attachments:first').on('click', function (event) {
-                self.$('.oe_msg_attachments:first').toggle();
+            this.$('.oe_mail_msg_view_attachments').on('click', function (event) {
+                var attach = self.$('.oe_msg_attachments:first, .oe_msg_images:first');
+                if( self.$('.oe_msg_attachments:first').hasClass("oe_hidden") ) {
+                    attach.removeClass("oe_hidden");
+                } else {
+                    attach.addClass("oe_hidden");
+                }
+                self.resize_img();
             });
             // event: click on icone 'Read' in header
             this.$el.on('click', '.oe_read', this.on_message_read_unread);
@@ -1584,8 +1587,6 @@ openerp.mail = function(session) {
          * @param {Array} [options.domain] domain on the Wall
          * @param {Object} [options.context] context, is an object. It should
          *      contain default_model, default_res_id, to give it to the threads.
-         * @param {Number} [options.thread_level] number of thread levels to display
-         *      0 being flat.
          */
         init: function (parent, options) {
             this._super(parent);
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 59ffc93bdf4..e806cf93a22 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -70,8 +70,8 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <span t-attf-class="oe_msg_attachments">
-            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image and !attachment.is_document">
+        <span class="oe_msg_attachments">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
                 <div class="oe_attachment">
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
@@ -90,21 +90,13 @@
                 </div>
             </t>
         </span>
-        <span t-attf-class="oe_msg_images">
+        <span class="oe_msg_images">
             <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_image">
                 <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
                     <img t-if="attachment.is_image" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-att-src="attachment.url"/>
                 </a>
             </t>
         </span>
-        <span t-attf-class="oe_msg_document">
-            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_document">
-                <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
-                    <t t-raw="attachment.name || attachment.filename"/>
-                </a>
-                <iframe t-attf-src="http://docs.google.com/viewer?url=#{ attachment.url_escape }&amp;embedded=true" width="600" height="400" style="border: none;"></iframe>
-            </t>
-        </span>
     </t>
 
     <t t-name="mail.thread.message.private">

From f503b4d5ff1262be3866ab7a7c73dca3ac3eed32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 10:20:01 +0200
Subject: [PATCH 070/106] [IMP] mail_thread: message_post_api now returns the
 new message_id, not the result of a message_read.

bzr revid: tde@openerp.com-20121025082001-4izbu2hg9rwc7jzb
---
 addons/mail/mail_thread.py        | 21 ++++++++++++++-------
 addons/mail/static/src/js/mail.js |  7 ++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 094cebdfdf1..e88e817addc 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -690,22 +690,29 @@ class mail_thread(osv.AbstractModel):
         return mail_message.create(cr, uid, values, context=context)
 
     def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
-                        subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
-        # TDE FIXME: body is plaintext: convert it into html
+                        subtype=None, parent_id=False, attachment_ids=None, context=None):
+        """ Wrapper on message_post, used only in Chatter (JS). The purpose is
+            to handle attachments.
+
+            # TDE FIXME: body is plaintext: convert it into html
+        """
         new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
                         subtype=subtype, parent_id=parent_id, context=context)
 
         # HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
-        if attachments:
+        if attachment_ids:
             ir_attachment = self.pool.get('ir.attachment')
             mail_message = self.pool.get('mail.message')
-            attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [('res_model', '=', 'mail.message'), ('res_id', '=', 0), ('create_uid', '=', uid), ('id', 'in', attachments)], context=context)
-            if attachment_ids:
+            filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [
+                ('res_model', '=', 'mail.message'),
+                ('res_id', '=', 0),
+                ('create_uid', '=', uid),
+                ('id', 'in', attachment_ids)], context=context)
+            if filtered_attachment_ids:
                 ir_attachment.write(cr, SUPERUSER_ID, attachment_ids, {'res_model': self._name, 'res_id': thread_id}, context=context)
                 mail_message.write(cr, SUPERUSER_ID, [new_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]}, context=context)
 
-        new_message = self.pool.get('mail.message').message_read(cr, uid, [new_message_id], parent_id=parent_id, context=context)
-        return new_message
+        return new_message_id
 
     #------------------------------------------------------
     # Followers API
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6d013c1d564..b385e6bc9ec 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -344,9 +344,10 @@ openerp.mail = function(session) {
                         attachments,
                         this.parent_thread.context
                     ]).then(function(records){
-                        self.parent_thread.switch_new_message(records);
-                        self.datasets.attachment_ids=[];
-                        self.on_cancel();
+                        // TDE note: temp deactivation, because this will be fixed in DOM-CHM
+                        // self.parent_thread.switch_new_message(records);
+                        // self.datasets.attachment_ids=[];
+                        // self.on_cancel();
                     });
                 return true;
             }

From a10c6c4dfdab8d7a8a1f722333d4a9c9b654f0c6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 25 Oct 2012 10:36:31 +0200
Subject: [PATCH 071/106] [IMP] mail: change message_post_api (method py return
 id); class indented in DOM for expandable & compose

bzr revid: chm@openerp.com-20121025083631-ze0x0rmnj7catsmu
---
 addons/mail/mail_thread.py          |  3 +-
 addons/mail/static/src/js/mail.js   | 71 ++++++++++++++---------------
 addons/mail/static/src/xml/mail.xml |  6 +--
 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index af4818bcbcd..7d3f48b0f3d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -708,8 +708,7 @@ class mail_thread(osv.AbstractModel):
                 ir_attachment.write(cr, SUPERUSER_ID, attachment_ids, {'res_model': self._name, 'res_id': thread_id}, context=context)
                 mail_message.write(cr, SUPERUSER_ID, [new_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]}, context=context)
 
-        new_message = self.pool.get('mail.message').message_read(cr, uid, [new_message_id], context=context)
-        return new_message
+        return new_message_id
 
     #------------------------------------------------------
     # Followers API
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6ba893339fc..f30255d209c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -155,6 +155,7 @@ openerp.mail = function(session) {
             this.is_private = datasets.is_private || false;
             this.partner_ids = datasets.partner_ids || [];
             this.avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
+            this.thread_level = datasets.thread_level;
             this.parent_thread= parent.messages!= undefined ? parent : false;
 
             this.ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
@@ -372,10 +373,9 @@ openerp.mail = function(session) {
                         'mail.mt_comment',
                         this.context.default_parent_id, 
                         attachments,
-                        // (this.options.display_indented_thread - this.thread_level),
                         this.parent_thread.context
-                    ]).then(function(records) {
-                        self.parent_thread.switch_new_message(records);
+                    ]).then(function(message_id) {
+                        self.parent_thread.message_fetch([['id', '=', message_id]]);
                         self.on_cancel();
                         //session.web.unblockUI();
                     });
@@ -457,13 +457,14 @@ openerp.mail = function(session) {
     mail.ThreadExpandable = session.web.Widget.extend({
         template: 'mail.thread.expandable',
 
-        init: function(parent, datasets, options) {
+        init: function(parent, datasets, context) {
             this._super(parent);
-            this.domain = options.domain || [];
+            this.domain = datasets.domain || [];
+            this.options = datasets.options;
             this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id: 0,
-                default_parent_id: false }, options.context || {});
+                default_parent_id: false }, context || {});
 
             // data of this expandable message
             this.id = datasets.id || -1,
@@ -474,7 +475,7 @@ openerp.mail = function(session) {
             this.type = 'expandable',
             this.max_limit = this.id < 0 || false,
             this.flag_used = false,
-            this.parent_thread= parent.messages!= undefined ? parent : options.options._parents[0];
+            this.parent_thread= parent.messages!= undefined ? parent : this.options._parents[0];
         },
 
         
@@ -572,9 +573,19 @@ openerp.mail = function(session) {
          *...  @param {int} [show_reply_button] number thread level to display the reply button
          *...  @param {int} [show_read_unread_button] number thread level to display the read/unread button
          */
-        init: function(parent, datasets, options) {
+        init: function(parent, datasets, context) {
             this._super(parent);
 
+            // record domain and context
+            this.domain = datasets.domain || [];
+            this.context = _.extend({
+                default_model: 'mail.thread',
+                default_res_id: 0,
+                default_parent_id: false }, context || {});
+
+            // record options
+            this.options = datasets.options;
+            
             // data of this message
             this.id = datasets.id ||  -1,
             this.model = datasets.model ||  false,
@@ -596,21 +607,12 @@ openerp.mail = function(session) {
             this.attachment_ids = datasets.attachment_ids ||  [],
             this._date = datasets.date;
 
-            // record domain and context
-            this.domain = options.domain || [];
-            this.context = _.extend({
-                default_model: 'mail.thread',
-                default_res_id: 0,
-                default_parent_id: false }, options.context || {});
-
-            // record options
-            this.options = options.options;
 
             this.show_reply_button = this.options.show_compose_message && this.options.show_reply_button > this.thread_level;
             this.show_read_unread_button = this.options.show_read_unread_button > this.thread_level;
 
             // record options and data
-            this.parent_thread= parent.messages!= undefined ? parent : options.options._parents[0];
+            this.parent_thread= parent.messages!= undefined ? parent : this.options._parents[0];
             this.thread = false;
 
             if( this.id > 0 ) {
@@ -1167,22 +1169,20 @@ openerp.mail = function(session) {
         create_message_object: function (data) {
             var self = this;
 
+            var data = _.extend(data, {'thread_level': data.thread_level ? data.thread_level : self.thread_level});
+            data.options = _.extend(self.options, data.options);
+
             if(data.type=='expandable'){
                 var message = new mail.ThreadExpandable(self, data, {
-                    'domain': data.domain,
-                    'context': {
-                        'default_model': data.model || self.context.default_model,
-                        'default_res_id': data.res_id || self.context.default_res_id,
-                        'default_parent_id': self.id },
+                    'default_model': data.model || self.context.default_model,
+                    'default_res_id': data.res_id || self.context.default_res_id,
+                    'default_parent_id': self.id,
                 });
             } else {
-                var message = new mail.ThreadMessage(self, _.extend(data, {'thread_level': data.thread_level ? data.thread_level : self.thread_level}), {
-                    'domain': data.domain,
-                    'context': {
-                        'default_model': data.model,
-                        'default_res_id': data.res_id,
-                        'default_parent_id': data.id },
-                    'options': _.extend(self.options, data.options)
+                var message = new mail.ThreadMessage(self, data, {
+                    'default_model': data.model,
+                    'default_res_id': data.res_id,
+                    'default_parent_id': data.id,
                 });
             }
 
@@ -1368,13 +1368,12 @@ openerp.mail = function(session) {
                     'ancestor_id': message.ancestor_id,
                     'nb_messages': 1,
                     'thread_level': message.thread_level,
-                    'ancestor_id': message.ancestor_id
-                    }, {
+                    'ancestor_id': message.ancestor_id,
                     'domain': message_dom,
-                    'context': {
-                        'default_model': message.model || this.context.default_model,
-                        'default_res_id': message.res_id || this.context.default_res_id,
-                        'default_parent_id': this.id },
+                    }, {
+                    'default_model': message.model || this.context.default_model,
+                    'default_res_id': message.res_id || this.context.default_res_id,
+                    'default_parent_id': this.id,
                 });
 
                 // add object on array and DOM
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e806cf93a22..0f0362e84ce 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -15,7 +15,7 @@
         for main thread composition form in document form view.
         -->
     <t t-name="mail.compose_message">
-        <div class="oe_msg oe_msg_composer">
+        <div t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <div class="oe_msg_left">
                 <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
@@ -40,7 +40,7 @@
         mail.compose_message when focus on textarea
         -->
     <t t-name="mail.compose_message.compact">
-        <div class="oe_msg oe_msg_composer_compact">
+        <div t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
     </t>
@@ -239,7 +239,7 @@
 
     <!-- expandable message layout -->
     <t t-name="mail.thread.expandable">
-        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_unread">
             <div class="oe_msg_content oe_msg_more_message">
                 <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">load one more message</a>
                 <a t-if="widget.nb_messages !== 1" class="oe_msg_fetch_more">load <t t-raw="widget.nb_messages" /> more messages</a>

From 163572f004a39ef27e2030e53538bc3bc3c44946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 10:37:01 +0200
Subject: [PATCH 072/106] [TEST] mail: test cleaned for vote and favorite.

bzr revid: tde@openerp.com-20121025083701-6ly0jv4oiznh2zfs
---
 addons/mail/tests/test_mail.py | 72 +++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 7668d743eab..8bfd5d44494 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -94,6 +94,8 @@ class TestMailMockups(common.TransactionCase):
         self._build_email_kwargs_list = []
 
     def _mock_build_email(self, *args, **kwargs):
+        """ Mock build_email to be able to test its values. Store them into
+            some internal variable for latter processing. """
         self._build_email_args_list.append(args)
         self._build_email_kwargs_list.append(kwargs)
         return self._build_email(*args, **kwargs)
@@ -140,7 +142,9 @@ class test_mail(TestMailMockups):
         group_employee_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
         group_employee_id = group_employee_ref and group_employee_ref[1] or False
         # Test users
-        self.user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul', 'groups_id': [(6, 0, [group_employee_id])]})
+        self.user_raoul_id = self.res_users.create(cr, uid,
+            {'name': 'Raoul Grosbedon', 'login': 'raoul', 'groups_id': [(6, 0, [group_employee_id])]})
+        self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
         self.user_admin = self.res_users.browse(cr, uid, uid)
 
         # Mock send_get_mail_body to test its functionality without other addons override
@@ -795,34 +799,46 @@ class test_mail(TestMailMockups):
 
     def test_60_message_vote(self):
         """ Test designed for the vote/unvote feature. """
-        cr, uid = self.cr, self.uid
-        user_admin = self.res_users.browse(cr, uid, uid)
-        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-        msg1 = group_pigs.message_post(body='My Body', subject='1')
-        msg1 = self.mail_message.browse(cr, uid, msg1)
+        cr, uid, user_admin, user_raoul, group_pigs = self.cr, self.uid, self.user_admin, self.user_raoul, self.group_pigs
+        # Data: post a message on Pigs
+        msg_id = group_pigs.message_post(body='My Body', subject='1')
+        msg = self.mail_message.browse(cr, uid, msg_id)
 
-        # Create user Bert Tartopoils
-        user_bert_id = self.res_users.create(cr, uid, {'name': 'Bert', 'login': 'bert'})
-        user_bert = self.res_users.browse(cr, uid, user_bert_id)
-
-        # Test: msg1 and msg2 have void vote_user_ids
-        self.assertFalse(msg1.vote_user_ids, 'newly created message msg1 has not void vote_user_ids')
-        # Do: Admin vote for msg1
-        self.mail_message.vote_toggle(cr, uid, [msg1.id])
-        msg1.refresh()
-        # Test: msg1 has Admin as voter
-        self.assertEqual(set(msg1.vote_user_ids), set([user_admin]), 'after voting, Admin is not the voter')
-        # Do: Bert vote for msg1
-        self.mail_message.vote_toggle(cr, user_bert_id, [msg1.id])
-        msg1.refresh()
-        # Test: msg1 has Admin and Bert as voters
-        self.assertEqual(set(msg1.vote_user_ids), set([user_admin, user_bert]), 'after voting, Admin and Bert are not the voters')
-        # Do: Admin unvote for msg1
-        self.mail_message.vote_toggle(cr, uid, [msg1.id])
-        msg1.refresh()
-        # Test: msg1 has Bert as voter
-        self.assertEqual(set(msg1.vote_user_ids), set([user_bert]), 'after unvoting for Admin, Bert is not the voter')
+        # Do: Admin vote for msg
+        self.mail_message.vote_toggle(cr, uid, [msg.id])
+        msg.refresh()
+        # Test: msg has Admin as voter
+        self.assertEqual(set(msg.vote_user_ids), set([user_admin]), 'mail_message vote: after voting, Admin should be in the voter')
+        # Do: Bert vote for msg
+        self.mail_message.vote_toggle(cr, user_raoul.id, [msg.id])
+        msg.refresh()
+        # Test: msg has Admin and Bert as voters
+        self.assertEqual(set(msg.vote_user_ids), set([user_admin, user_raoul]), 'mail_message vote: after voting, Admin and Bert should be in the voters')
+        # Do: Admin unvote for msg
+        self.mail_message.vote_toggle(cr, uid, [msg.id])
+        msg.refresh()
+        # Test: msg has Bert as voter
+        self.assertEqual(set(msg.vote_user_ids), set([user_raoul]), 'mail_message vote: after unvoting, Bert should be in the voter')
 
     def test_70_message_favorite(self):
         """ Tests for favorites. """
-        self.assertTrue(1 == 1, 'Test not implemented, do not replace by return True')
+        cr, uid, user_admin, user_raoul, group_pigs = self.cr, self.uid, self.user_admin, self.user_raoul, self.group_pigs
+        # Data: post a message on Pigs
+        msg_id = group_pigs.message_post(body='My Body', subject='1')
+        msg = self.mail_message.browse(cr, uid, msg_id)
+
+        # Do: Admin stars msg
+        self.mail_message.favorite_toggle(cr, uid, [msg.id])
+        msg.refresh()
+        # Test: msg starred by Admin
+        self.assertEqual(set(msg.favorite_user_ids), set([user_admin]), 'mail_message favorite: after starring, Admin should be in favorite_user_ids')
+        # Do: Bert stars msg
+        self.mail_message.favorite_toggle(cr, user_raoul.id, [msg.id])
+        msg.refresh()
+        # Test: msg starred by Admin and Raoul
+        self.assertEqual(set(msg.favorite_user_ids), set([user_admin, user_raoul]), 'mail_message favorite: after starring, Admin and Raoul should be in favorite_user_ids')
+        # Do: Admin unvote for msg
+        self.mail_message.favorite_toggle(cr, uid, [msg.id])
+        msg.refresh()
+        # Test: msg starred by Raoul
+        self.assertEqual(set(msg.favorite_user_ids), set([user_raoul]), 'mail_message favorite: after unstarring, Raoul should be in favorite_user_ids')

From 31965cf97a090a8d47a893e4f6c53fb2ea96e410 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 25 Oct 2012 11:59:23 +0200
Subject: [PATCH 073/106] [IMP] mail: insert message post, and no quote for
 reply

bzr revid: chm@openerp.com-20121025095923-7urqi5he10q3z1i6
---
 addons/mail/mail_thread.py                 |  12 +-
 addons/mail/static/src/css/mail.css        |   9 +
 addons/mail/static/src/js/mail.js          | 381 +++++++++++----------
 addons/mail/static/src/xml/mail.xml        |   2 +-
 addons/mail/wizard/mail_compose_message.py |   6 +-
 5 files changed, 225 insertions(+), 185 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7d3f48b0f3d..8269049f917 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -694,7 +694,13 @@ class mail_thread(osv.AbstractModel):
         # TDE FIXME: body is plaintext: convert it into html
         # when writing on res.partner, without specific thread_id -> redirect to the user's partner
         if self._name == 'res.partner' and not thread_id:
-            thread_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+            thread_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id', 'subject'], context=context)['partner_id'][0]
+
+        mail_message = self.pool.get('mail.message')
+
+        if not subject and parent_id:
+            parent = mail_message.read(cr, uid, parent_id, ['subject'], context=context)
+            subject = 'Re: ' + parent['subject']
 
         new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
                         subtype=subtype, parent_id=parent_id, context=context)
@@ -702,13 +708,13 @@ class mail_thread(osv.AbstractModel):
         # Chatter: attachments linked to the document (not done JS-side), load the message
         if attachments:
             ir_attachment = self.pool.get('ir.attachment')
-            mail_message = self.pool.get('mail.message')
             attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [('res_model', '=', 'mail.compose.message'), ('res_id', '=', 0), ('create_uid', '=', uid), ('id', 'in', attachments)], context=context)
             if attachment_ids:
                 ir_attachment.write(cr, SUPERUSER_ID, attachment_ids, {'res_model': self._name, 'res_id': thread_id}, context=context)
                 mail_message.write(cr, SUPERUSER_ID, [new_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]}, context=context)
 
-        return new_message_id
+        new_message = self.pool.get('mail.message').message_read(cr, uid, [new_message_id], context=context)
+        return new_message
 
     #------------------------------------------------------
     # Followers API
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 0221c36824c..98618cc4729 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -253,3 +253,12 @@
     opacity: 1;
     -webkit-transition: opacity 0.2s linear;
 }
+
+/* ---------------- MESSAGES BODY ------------------ */
+
+.openerp .oe_mail .oe_msg_content .oe_blockquote,
+.openerp .oe_mail .oe_msg_content blockquote {
+    padding: 4px;
+    border-radius: 2px;
+    border: solid 1px rgba(124,123,173,0.14);
+}
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f30255d209c..5339f92035b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1,4 +1,4 @@
-openerp.mail = function(session) {
+openerp.mail = function (session) {
     var _t = session.web._t,
        _lt = session.web._lt;
 
@@ -16,7 +16,9 @@ openerp.mail = function(session) {
      */
 
     session.web.FormView = session.web.FormView.extend({
-        do_action: function(action) {
+        do_action: function (action) {
+            console.log(action);
+
             if (action.res_model == 'mail.compose.message') {
                 /* hack for stop context propagation of wrong value
                  * delete this hack when a global method to clean context is create
@@ -24,7 +26,7 @@ openerp.mail = function(session) {
                 var context_keys = ['default_template_id', 'default_composition_mode', 
                     'default_use_template', 'default_partner_ids', 'default_model',
                     'default_res_id', 'default_content_subtype', 'active_id', 'lang',
-                    'bin_raw', 'tz', 'active_model', 'edi_web_url_view', 'active_ids']
+                    'bin_raw', 'tz', 'active_model', 'edi_web_url_view', 'active_ids', 'default_subject']
                 for (var key in action.context) {
                     if (_.indexOf(context_keys, key) == -1) {
                         action.context[key] = null;
@@ -53,7 +55,7 @@ openerp.mail = function(session) {
 
         /**
          *Get an image in /web/binary/image?... */
-        get_image: function(session, model, field, id) {
+        get_image: function (session, model, field, id) {
             return session.prefix + '/web/binary/image?session_id=' + session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
@@ -85,7 +87,7 @@ openerp.mail = function(session) {
          * (add <p>, <a>)
          * TDE note : should not be here, but server-side I think ...
         */
-        get_text2html: function(text){
+        get_text2html: function (text) {
             return text
                 .replace(/[\n\r]/g,'<br/>')
                 .replace(/((?:https?|ftp):\/\/[\S]+)/g,'<a href="$1">$1</a> ')
@@ -106,7 +108,7 @@ openerp.mail = function(session) {
                 nb_and += 1;
             }
 
-            for (var k = 0; k < nb_and ; k++){
+            for (var k = 0; k < nb_and ; k++) {
                 domain.unshift('&');
             }
 
@@ -168,10 +170,10 @@ openerp.mail = function(session) {
             this.$render_compact = false;
         },
 
-        start: function(){
+        start: function () {
             this.$render_compact = this.$el;
 
-            if( this.options.show_compact_message ) {
+            if ( this.options.show_compact_message ) {
                 this.$render_compact.show();
             } else {
                 this.$render_compact.hide();
@@ -181,10 +183,10 @@ openerp.mail = function(session) {
 
         /* upload the file on the server, add in the attachments list and reload display
          */
-        display_attachments: function(){
+        display_attachments: function () {
             var self = this;
             var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self}));
-            if(!this.list_attachment){
+            if (!this.list_attachment) {
                 this.$render_expandable.find('.oe_msg_attachment_list').replaceWith( render );
             } else {
                 this.list_attachment.replaceWith( render );
@@ -207,9 +209,9 @@ openerp.mail = function(session) {
 
                 // if the files exits for this answer, delete the file before upload
                 var attachments=[];
-                for(var i in this.attachment_ids){
-                    if((this.attachment_ids[i].filename || this.attachment_ids[i].name) == filename){
-                        if(this.attachment_ids[i].upload){
+                for (var i in this.attachment_ids) {
+                    if ((this.attachment_ids[i].filename || this.attachment_ids[i].name) == filename) {
+                        if (this.attachment_ids[i].upload) {
                             return false;
                         }
                         this.ds_attachment.unlink([this.attachment_ids[i].id]);
@@ -238,8 +240,8 @@ openerp.mail = function(session) {
         /* when the file is uploaded 
         */
         on_attachment_loaded: function (event, result) {
-            for(var i in this.attachment_ids){
-                if(this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload) {
+            for (var i in this.attachment_ids) {
+                if (this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload) {
                     this.attachment_ids[i]={
                         'id': result.id,
                         'name': result.name,
@@ -262,8 +264,8 @@ openerp.mail = function(session) {
             var attachment_id=$(event.target).data("id");
             if (attachment_id) {
                 var attachments=[];
-                for(var i in this.attachment_ids){
-                    if(attachment_id!=this.attachment_ids[i].id){
+                for (var i in this.attachment_ids) {
+                    if (attachment_id!=this.attachment_ids[i].id) {
                         attachments.push(this.attachment_ids[i]);
                     }
                     else {
@@ -275,18 +277,18 @@ openerp.mail = function(session) {
             }
         },
 
-        bind_events: function() {
+        bind_events: function () {
             var self = this;
 
             this.$render_compact.find('textarea').unbind().on('focus', self.on_compose_expandable);
 
-            if(this.$render_expandable){
+            if (this.$render_expandable) {
                 // set the function called when attachments are added
                 this.$render_expandable.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
 
                 this.$render_expandable.on('click', '.oe_cancel', self.on_cancel );
-                this.$render_expandable.on('click', '.oe_post', function(){self.on_message_post()} );
-                this.$render_expandable.on('click', '.oe_full', function(){self.on_compose_fullmail()} );
+                this.$render_expandable.on('click', '.oe_post', function () {self.on_message_post()} );
+                this.$render_expandable.on('click', '.oe_full', function () {self.on_compose_fullmail('reply')} );
 
                 // auto close
                 this.$render_expandable.on('blur', 'textarea', this.on_compose_expandable);
@@ -297,15 +299,37 @@ openerp.mail = function(session) {
             }
         },
 
-        on_compose_fullmail: function(){
+        on_compose_fullmail: function (default_composition_mode) {
             /* TDE note: I think this is not necessary, because
              * 1/ post on a document: followers added server-side in _notify
              * 2/ reply to a message: mail.compose.message should add the previous partners
              */
-            var partner_ids=[];
-            for(var i in this.partner_ids){
+            var partner_ids = [];
+            for (var i in this.partner_ids) {
                 partner_ids.push(this.partner_ids[i][0]);
             }
+
+            if (default_composition_mode == 'reply') {
+                var context = {
+                    'default_composition_mode': 'reply',
+                    'default_parent_id': this.id,
+                    'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
+                    'default_attachment_ids': this.attachment_ids,
+                    'default_partner_ids': [], //partner_ids
+                };
+            } else {
+                var context = {
+                    'default_model': this.context.default_model,
+                    'default_res_model': this.context.default_model,
+                    'default_res_id': this.context.default_res_id,
+                    'default_content_subtype': 'html',
+                    'default_composition_mode': 'comment',
+                    'default_parent_id': this.id,
+                    'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
+                    'default_attachment_ids': this.attachment_ids,
+                    'default_partner_ids': [], //partner_ids
+                };
+            }
             var action = {
                 type: 'ir.actions.act_window',
                 res_model: 'mail.compose.message',
@@ -314,26 +338,18 @@ openerp.mail = function(session) {
                 action_from: 'mail.ThreadComposeMessage',
                 views: [[false, 'form']],
                 target: 'new',
-                context: {
-                    'default_model': this.context.default_model,
-                    'default_res_model': this.context.default_model,
-                    'default_res_id': this.context.default_res_id,
-                    'default_content_subtype': 'html',
-                    'default_parent_id': this.id,
-                    'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
-                    'default_attachment_ids': this.attachment_ids,
-                    'default_partner_ids': partner_ids
-                },
+                context: context,
             };
+
             this.do_action(action);
 
-            if(this.$render_expandable) {
+            if (this.$render_expandable) {
                 this.on_cancel();
             }
         },
 
-        on_cancel: function(event){
-            if(event) event.stopPropagation();
+        on_cancel: function (event) {
+            if (event) event.stopPropagation();
             this.$render_expandable.find('textarea').val("");
             this.$render_expandable.find('input[data-id]').remove();
 
@@ -355,15 +371,15 @@ openerp.mail = function(session) {
             }
 
             var attachments=[];
-            for(var i in this.attachment_ids){
-                if(this.attachment_ids[i].upload){
+            for (var i in this.attachment_ids) {
+                if (this.attachment_ids[i].upload) {
                     session.web.dialog($('<div>' + session.web.qweb.render('CrashManager.warning', {message: 'Please, wait while the file is uploading.'}) + '</div>'));
                     return false;
                 }
                 attachments.push(this.attachment_ids[i].id);
             }
 
-            if(body.match(/\S+/)) {
+            if (body.match(/\S+/)) {
                 //session.web.blockUI();
                 this.parent_thread.ds_thread.call('message_post_api', [
                         this.context.default_res_id, 
@@ -374,8 +390,13 @@ openerp.mail = function(session) {
                         this.context.default_parent_id, 
                         attachments,
                         this.parent_thread.context
-                    ]).then(function(message_id) {
-                        self.parent_thread.message_fetch([['id', '=', message_id]]);
+                    ]).then(function (record) {
+                        var thread = self.parent_thread;
+                        // create object and attach to the thread object
+                        var message = thread.create_message_object( record[0] );
+                        // insert the message on dom
+                        thread.insert_message( message, self.thread_level > self.options.display_indented_thread ? self.parent_thread.$el : self.$el );
+                        // clean compose message
                         self.on_cancel();
                         //session.web.unblockUI();
                     });
@@ -385,8 +406,8 @@ openerp.mail = function(session) {
 
         /* create the compose on expandable form
         */
-        instantiate_expandable: function() {
-            if(!this.$render_expandable) {
+        instantiate_expandable: function () {
+            if (!this.$render_expandable) {
                 this.$render_expandable = $(session.web.qweb.render('mail.compose_message', {'widget': this}));
                 this.$render_expandable.hide();
 
@@ -399,25 +420,25 @@ openerp.mail = function(session) {
 
         /* convert the compact mode into the compose message
         */
-        on_compose_expandable: function(event){
-            if(event) event.stopPropagation();
+        on_compose_expandable: function (event) {
+            if (event) event.stopPropagation();
 
             var self = this;
 
             this.instantiate_expandable();
 
-            if(this.$render_expandable.is(':hidden')){
+            if (this.$render_expandable.is(':hidden')) {
 
                 this.$render_expandable.css('display', '');
                 this.$render_compact.hide();
                 this.$render_expandable.find('textarea').focus();
 
-            } else if(!this.stay_open){
+            } else if (!this.stay_open) {
 
                 // do not close the box if there are some text
-                if(!this.$render_expandable.find('textarea').val().match(/\S+/)){
+                if (!this.$render_expandable.find('textarea').val().match(/\S+/)) {
                     this.$render_expandable.hide();
-                    if(this.options.show_compact_message && this.show_compact_message) {
+                    if (this.options.show_compact_message && this.show_compact_message) {
                         this.$render_compact.css('display', '');
                     } else {
                         this.$render_compact.hide();
@@ -428,13 +449,13 @@ openerp.mail = function(session) {
             return true;
         },
 
-        do_hide_compact: function() {
+        do_hide_compact: function () {
             this.$render_compact.hide();
             this.show_compact_message = false;
         },
 
-        do_show_compact: function() {
-            if(this.options.show_compact_message && (!this.$render_expandable || this.$render_expandable.is(':hidden'))) {
+        do_show_compact: function () {
+            if (this.options.show_compact_message && (!this.$render_expandable || this.$render_expandable.is(':hidden'))) {
                 this.$render_compact.css('display', '');
             }
             this.show_compact_message = true;
@@ -457,7 +478,7 @@ openerp.mail = function(session) {
     mail.ThreadExpandable = session.web.Widget.extend({
         template: 'mail.thread.expandable',
 
-        init: function(parent, datasets, context) {
+        init: function (parent, datasets, context) {
             this._super(parent);
             this.domain = datasets.domain || [];
             this.options = datasets.options;
@@ -479,7 +500,7 @@ openerp.mail = function(session) {
         },
 
         
-        start: function() {
+        start: function () {
             this._super.apply(this, arguments);
             this.bind_events();
         },
@@ -494,15 +515,15 @@ openerp.mail = function(session) {
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
-        bind_events: function() {
+        bind_events: function () {
             this.$el.on('click', 'a.oe_msg_fetch_more', this.on_expandable);
         },
 
-        animated_destroy: function(options) {
+        animated_destroy: function (options) {
             var self=this;
             //graphic effects
-            if(options && options.fadeTime) {
-                self.$el.fadeOut(options.fadeTime, function(){
+            if (options && options.fadeTime) {
+                self.$el.fadeOut(options.fadeTime, function () {
                     self.destroy();
                 });
             } else {
@@ -514,8 +535,8 @@ openerp.mail = function(session) {
         * @param {object} mouse envent
         */
         on_expandable: function (event) {
-            if(event)event.stopPropagation();
-            if(this.flag_used) {
+            if (event)event.stopPropagation();
+            if (this.flag_used) {
                 return false
             }
             this.flag_used = true;
@@ -528,7 +549,7 @@ openerp.mail = function(session) {
         /**
          * call on_message_delete on his parent thread
         */
-        destroy: function() {
+        destroy: function () {
 
             this._super();
             this.parent_thread.on_message_detroy(this);
@@ -573,7 +594,7 @@ openerp.mail = function(session) {
          *...  @param {int} [show_reply_button] number thread level to display the reply button
          *...  @param {int} [show_read_unread_button] number thread level to display the read/unread button
          */
-        init: function(parent, datasets, context) {
+        init: function (parent, datasets, context) {
             this._super(parent);
 
             // record domain and context
@@ -585,7 +606,7 @@ openerp.mail = function(session) {
 
             // record options
             this.options = datasets.options;
-            
+
             // data of this message
             this.id = datasets.id ||  -1,
             this.model = datasets.model ||  false,
@@ -615,7 +636,7 @@ openerp.mail = function(session) {
             this.parent_thread= parent.messages!= undefined ? parent : this.options._parents[0];
             this.thread = false;
 
-            if( this.id > 0 ) {
+            if ( this.id > 0 ) {
                 this.formating_data();
             }
 
@@ -627,7 +648,7 @@ openerp.mail = function(session) {
         /**
          *Convert date, timerelative and avatar in displayable data.
         */
-        formating_data: function(){
+        formating_data: function () {
 
             //formating and add some fields for render
             this.date = session.web.format_value(this._date, {type:"datetime"});
@@ -641,28 +662,28 @@ openerp.mail = function(session) {
                 var attach = this.attachment_ids[l];
                 attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
 
-                if((attach.filename || attach.name).match(/[.](jpg|jpg|gif|png|tif|svg)$/i)) {
+                if ((attach.filename || attach.name).match(/[.](jpg|jpg|gif|png|tif|svg)$/i)) {
                     attach.is_image = true;
                     attach['url'] = mail.ChatterUtils.get_image(this.session, 'ir.attachment', 'datas', attach.id); 
                 }
             }
         },
         
-        start: function() {
+        start: function () {
             this._super.apply(this, arguments);
             this.expender();
-            this.$el.hide().fadeIn(750, function() {$(this).css('display', '');});
+            this.$el.hide().fadeIn(750, function () {$(this).css('display', '');});
             this.resize_img();
             this.bind_events();
             this.create_thread();
             this.$('.oe_msg_attachments, .oe_msg_images').addClass("oe_hidden");
         },
 
-        resize_img: function() {
-            var resize = function() {
+        resize_img: function () {
+            var resize = function () {
                 var h = $(this).height();
                 var w = $(this).width();
-                if( h > 100 || w >100 ) {
+                if ( h > 100 || w >100 ) {
                     var ratio = 100 / (h > w ? h : w);
                     $(this).attr("width", parseInt( w*ratio )).attr("height", parseInt( h*ratio ));
                 }
@@ -673,13 +694,13 @@ openerp.mail = function(session) {
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
-        bind_events: function() {
+        bind_events: function () {
             var self = this;
 
             // event: click on 'Attachment(s)' in msg
             this.$('.oe_mail_msg_view_attachments').on('click', function (event) {
                 var attach = self.$('.oe_msg_attachments:first, .oe_msg_images:first');
-                if( self.$('.oe_msg_attachments:first').hasClass("oe_hidden") ) {
+                if ( self.$('.oe_msg_attachments:first').hasClass("oe_hidden") ) {
                     attach.removeClass("oe_hidden");
                 } else {
                     attach.addClass("oe_hidden");
@@ -704,13 +725,13 @@ openerp.mail = function(session) {
         /**
          * call the on_compose_message on the thread of this message.
          */
-        on_message_reply:function(event){
+        on_message_reply:function (event) {
             event.stopPropagation();
             this.thread.on_compose_message();
             return false;
         },
 
-        expender: function(){
+        expender: function () {
             this.$('.oe_msg_body:first').expander({
                 slicePoint: this.options.truncate_limit,
                 expandText: 'read more',
@@ -725,8 +746,8 @@ openerp.mail = function(session) {
          * instantiate the thread object of this message.
          * Each message have only one thread.
          */
-        create_thread: function(){
-            if(this.thread){
+        create_thread: function () {
+            if (this.thread) {
                 return false;
             }
             /*create thread*/
@@ -748,11 +769,11 @@ openerp.mail = function(session) {
          * Fade out the message and his child thread.
          * Then this object is destroyed.
          */
-        animated_destroy: function(options) {
+        animated_destroy: function (options) {
             var self=this;
             //graphic effects  
-            if(options && options.fadeTime) {
-                self.$el.fadeOut(options.fadeTime, function(){
+            if (options && options.fadeTime) {
+                self.$el.fadeOut(options.fadeTime, function () {
                     self.parent_thread.message_to_expandable(self);
                 });
                 self.thread.$el.fadeOut(options.fadeTime);
@@ -783,13 +804,13 @@ openerp.mail = function(session) {
             event.stopPropagation();
             var self=this;
 
-            if( (this.to_read && this.options.typeof_thread == 'inbox') ||
+            if ( (this.to_read && this.options.typeof_thread == 'inbox') ||
                 (!this.to_read && this.options.typeof_thread == 'archives')) {
                 this.animated_destroy({fadeTime:250});
             }
 
             // if this message is read, all childs message display is read
-            this.ds_notification.call('set_message_read', [ [this.id].concat( this.get_child_ids() ) , this.to_read, this.context]).pipe(function(){
+            this.ds_notification.call('set_message_read', [ [this.id].concat( this.get_child_ids() ) , this.to_read, this.context]).pipe(function () {
                 self.$el.removeClass(self.to_read ? 'oe_msg_unread':'oe_msg_read').addClass(self.to_read ? 'oe_msg_read':'oe_msg_unread');
                 self.to_read = !self.to_read;
             });
@@ -805,23 +826,23 @@ openerp.mail = function(session) {
          *      private for check the top thread
          * @return thread object
          */
-        browse_message: function(options){
+        browse_message: function (options) {
             // goto the wall thread for launch browse
-            if(!options._go_thread_wall) {
+            if (!options._go_thread_wall) {
                 options._go_thread_wall = true;
-                for(var i in this.options._parents[0].messages){
+                for (var i in this.options._parents[0].messages) {
                     var res=this.options._parents[0].messages[i].browse_message(options);
-                    if(res) return res;
+                    if (res) return res;
                 }
             }
 
-            if(this.id==options.id)
+            if (this.id==options.id)
                 return this;
 
-            for(var i in this.thread.messages){
-                if(this.thread.messages[i].thread){
+            for (var i in this.thread.messages) {
+                if (this.thread.messages[i].thread) {
                     var res=this.thread.messages[i].browse_message(options);
-                    if(res) return res;
+                    if (res) return res;
                 }
             }
 
@@ -831,10 +852,10 @@ openerp.mail = function(session) {
         /* get all child message id linked.
          * @return array of id
         */
-        get_child_ids: function(){
+        get_child_ids: function () {
             var res=[]
-            if(arguments[0]) res.push(this.id);
-            if(this.thread){
+            if (arguments[0]) res.push(this.id);
+            if (this.thread) {
                 res = res.concat( this.thread.get_child_ids(true) );
             }
             return res;
@@ -846,7 +867,7 @@ openerp.mail = function(session) {
         on_vote: function (event) {
             event.stopPropagation();
             var self=this;
-            return this.ds_message.call('vote_toggle', [[self.id]]).pipe(function(vote){
+            return this.ds_message.call('vote_toggle', [[self.id]]).pipe(function (vote) {
                 self.has_voted = vote;
                 self.vote_nb += self.has_voted ? 1 : -1;
                 self.display_vote();
@@ -871,13 +892,13 @@ openerp.mail = function(session) {
             event.stopPropagation();
             var self=this;
             var button = self.$('.oe_star:first');
-            return this.ds_message.call('favorite_toggle', [[self.id]]).pipe(function(star){
+            return this.ds_message.call('favorite_toggle', [[self.id]]).pipe(function (star) {
                 self.is_favorite=star;
-                if(self.is_favorite){
+                if (self.is_favorite) {
                     button.addClass('oe_starred');
                 } else {
                     button.removeClass('oe_starred');
-                    if( self.options.typeof_thread == 'stared' ) {
+                    if ( self.options.typeof_thread == 'stared' ) {
                         self.animated_destroy({fadeTime:250});
                     }
                 }
@@ -888,7 +909,7 @@ openerp.mail = function(session) {
         /**
          * call on_message_delete on his parent thread
         */
-        destroy: function() {
+        destroy: function () {
 
             this._super();
             this.parent_thread.on_message_detroy(this);
@@ -931,7 +952,7 @@ openerp.mail = function(session) {
          *          @param {Array} [parents] liked with the parents thread
          *              use with browse, fetch... [O]= top parent
          */
-        init: function(parent, datasets, options) {
+        init: function (parent, datasets, options) {
             this._super(parent);
             this.domain = options.domain || [];
             this.context = _.extend({
@@ -952,7 +973,7 @@ openerp.mail = function(session) {
             this.is_private =  datasets.is_private || false,
             this.author_id =  datasets.author_id || false,
             this.thread_level =  (datasets.thread_level+1) || 0,
-            this.partner_ids =  _.filter(datasets.partner_ids, function(partner){ return partner[0]!=datasets.author_id[0]; } ) 
+            this.partner_ids =  _.filter(datasets.partner_ids, function (partner) { return partner[0]!=datasets.author_id[0]; } ) 
             this.messages = [];
             this.show_compose_message = this.options.show_compose_message && (this.options.show_reply_button > this.thread_level || !this.thread_level);
 
@@ -963,9 +984,9 @@ openerp.mail = function(session) {
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
         },
         
-        start: function() {
+        start: function () {
             this._super.apply(this, arguments);
-            if(this.show_compose_message){
+            if (this.show_compose_message) {
                 this.instantiate_ComposeMessage();
             }
             this.bind_events();
@@ -974,14 +995,14 @@ openerp.mail = function(session) {
         /* instantiate the compose message object and insert this on the DOM.
         * The compose message is display in compact form.
         */
-        instantiate_ComposeMessage: function(){
+        instantiate_ComposeMessage: function () {
             // add message composition form view
             this.ComposeMessage = new mail.ThreadComposeMessage(this, this, {
                 'context': this.context,
                 'options': this.options,
             });
 
-            if(this.thread_level){
+            if (this.thread_level) {
                 this.ComposeMessage.appendTo(this.$el);
             } else {
                 // root view
@@ -993,17 +1014,17 @@ openerp.mail = function(session) {
         /* When the expandable object is visible on screen (with scrolling)
          * then the on_expandable function is launch
         */
-        on_scroll: function(event){
-            if(event)event.stopPropagation();
+        on_scroll: function (event) {
+            if (event)event.stopPropagation();
             this.$('.oe_msg_expandable:last');
 
             var message = this.messages[this.messages.length-1];
-            if(message && message.type=="expandable" && message.max_limit) {
+            if (message && message.type=="expandable" && message.max_limit) {
                 var pos = message.$el.position();
-                if(pos.top){
+                if (pos.top) {
                     /* bottom of the screen */
                     var bottom = $(window).scrollTop()+$(window).height()+200;
-                    if(bottom > pos.top){
+                    if (bottom > pos.top) {
                         message.on_expandable();
                     }
                 }
@@ -1013,7 +1034,7 @@ openerp.mail = function(session) {
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
-        bind_events: function() {
+        bind_events: function () {
             var self = this;
             self.$el.on('click', '.oe_mail_list_recipients .oe_more', self.on_show_recipients);
             self.$el.on('click', '.oe_mail_compose_textarea .oe_more_hidden', self.on_hide_recipients);
@@ -1022,7 +1043,7 @@ openerp.mail = function(session) {
         /**
          *show all the partner list of this parent message
         */
-        on_show_recipients: function(){
+        on_show_recipients: function () {
             var p=$(this).parent(); 
             p.find('.oe_more_hidden, .oe_hidden').show(); 
             p.find('.oe_more').hide(); 
@@ -1031,7 +1052,7 @@ openerp.mail = function(session) {
         /**
          *hide a part of the partner list of this parent message
         */
-        on_hide_recipients: function(){
+        on_hide_recipients: function () {
             var p=$(this).parent(); 
             p.find('.oe_more_hidden, .oe_hidden').hide(); 
             p.find('.oe_more').show(); 
@@ -1040,7 +1061,7 @@ openerp.mail = function(session) {
         /* get all child message/thread id linked.
          * @return array of id
         */
-        get_child_ids: function(){
+        get_child_ids: function () {
             var res=[];
             _(this.get_childs()).each(function (val, key) { res.push(val.id); });
             return res;
@@ -1050,12 +1071,12 @@ openerp.mail = function(session) {
          * @param {int} nb_thread_level, number of traversed thread level for this search
          * @return array of thread object
         */
-        get_childs: function(nb_thread_level){
+        get_childs: function (nb_thread_level) {
             var res=[];
-            if(arguments[1]) res.push(this);
-            if(isNaN(nb_thread_level) || nb_thread_level>0){
+            if (arguments[1]) res.push(this);
+            if (isNaN(nb_thread_level) || nb_thread_level>0) {
                 _(this.messages).each(function (val, key) {
-                    if(val.thread) {
+                    if (val.thread) {
                         res = res.concat( val.thread.get_childs((isNaN(nb_thread_level) ? undefined : nb_thread_level-1), true) );
                     }
                 });
@@ -1074,28 +1095,28 @@ openerp.mail = function(session) {
          *      return the top thread (wall) if no thread found
          * @return thread object
          */
-        browse_thread: function(options){
+        browse_thread: function (options) {
             // goto the wall thread for launch browse
-            if(!options._go_thread_wall) {
+            if (!options._go_thread_wall) {
                 options._go_thread_wall = true;
                 return this.options._parents[0].browse_thread(options);
             }
 
-            if(this.id==options.id){
+            if (this.id==options.id) {
                 return this;
             }
 
-            if(options.id){
-                for(var i in this.messages){
-                    if(this.messages[i].thread){
+            if (options.id) {
+                for (var i in this.messages) {
+                    if (this.messages[i].thread) {
                         var res=this.messages[i].thread.browse_thread({'id':options.id, '_go_thread_wall':true});
-                        if(res) return res;
+                        if (res) return res;
                     }
                 }
             }
 
             //if option default_return_top_thread, return the top if no found thread
-            if(options.default_return_top_thread){
+            if (options.default_return_top_thread) {
                 return this;
             }
 
@@ -1111,8 +1132,8 @@ openerp.mail = function(session) {
          *      private for check the top thread
          * @return message object
          */
-        browse_message: function(options){
-            if(this.options._parents[0].messages[0])
+        browse_message: function (options) {
+            if (this.options._parents[0].messages[0])
                 return this.options._parents[0].messages[0].browse_message(options);
         },
 
@@ -1121,8 +1142,8 @@ openerp.mail = function(session) {
         * Call the on_compose_expandable method to allow the user to write his message.
         * (Is call when a user click on "Reply" button)
         */
-        on_compose_message: function(){
-            if(!this.ComposeMessage){
+        on_compose_message: function () {
+            if (!this.ComposeMessage) {
                 this.instantiate_ComposeMessage();
                 this.ComposeMessage.do_hide_compact();
             }
@@ -1133,7 +1154,7 @@ openerp.mail = function(session) {
         /**
          *display the message "there are no message" on the thread
         */
-        no_message: function(){
+        no_message: function () {
             $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$el);
         },
 
@@ -1172,7 +1193,7 @@ openerp.mail = function(session) {
             var data = _.extend(data, {'thread_level': data.thread_level ? data.thread_level : self.thread_level});
             data.options = _.extend(self.options, data.options);
 
-            if(data.type=='expandable'){
+            if (data.type=='expandable') {
                 var message = new mail.ThreadExpandable(self, data, {
                     'default_model': data.model || self.context.default_model,
                     'default_res_id': data.res_id || self.context.default_res_id,
@@ -1186,16 +1207,15 @@ openerp.mail = function(session) {
                 });
             }
 
-            // insert the message on dom
-            self.insert_message( message );
-
             // check if the message is already create
-            for(var i in self.messages){
-                if(self.messages[i] && self.messages[i].id == message.id){
+            for (var i in self.messages) {
+                if (self.messages[i] && self.messages[i].id == message.id) {
                     self.messages[i].destroy();
                 }
             }
             self.messages.push( message );
+
+            return message;
         },
 
         /**
@@ -1207,27 +1227,32 @@ openerp.mail = function(session) {
          * The sort is define by the thread_level (O for newer on top).
          * @param : {object} ThreadMessage object
          */
-        insert_message: function (message) {
+        insert_message: function (message, dom_insert_after) {
             var self=this;
 
-            if(this.show_compose_message /*&& 
-                this.options.display_indented_thread >= self.thread_level*/){
+            if (this.show_compose_message) {
                 this.ComposeMessage.do_show_compact();
             }
 
             this.$('.oe_wall_no_message').remove();
 
+
+            if (dom_insert_after) {
+                message.insertAfter(dom_insert_after);
+                return message
+            } 
+
             // check older and newer message for insertion
             var parent_newer = false;
             var parent_older = false;
-            if(message.id > 0){
-                for(var i in self.messages){
-                    if(self.messages[i].id > message.id){
-                        if(!parent_newer || parent_newer.id > self.messages[i].id) {
+            if (message.id > 0) {
+                for (var i in self.messages) {
+                    if (self.messages[i].id > message.id) {
+                        if (!parent_newer || parent_newer.id > self.messages[i].id) {
                             parent_newer = self.messages[i];
                         }
-                    } else if(self.messages[i].id > 0 && self.messages[i].id < message.id) {
-                        if(!parent_older || parent_older.id < self.messages[i].id) {
+                    } else if (self.messages[i].id > 0 && self.messages[i].id < message.id) {
+                        if (!parent_older || parent_older.id < self.messages[i].id) {
                             parent_older = self.messages[i];
                         }
                     }
@@ -1243,11 +1268,11 @@ openerp.mail = function(session) {
                     //warning : insert after the thread of the message !
                     message.insertAfter(parent_older.thread ? parent_older.thread.$el : parent_older.$el);
 
-                } else if(parent_newer) {
+                } else if (parent_newer) {
 
                     message.insertBefore(parent_newer.$el);
 
-                } else if(message.id < 0) {
+                } else if (message.id < 0) {
 
                     message.appendTo(self.$el);
 
@@ -1260,12 +1285,12 @@ openerp.mail = function(session) {
 
                     message.insertBefore(parent_older.$el);
 
-                } else if(parent_newer) {
+                } else if (parent_newer) {
 
                     //warning : insert after the thread of the message !
                     message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
 
-                } else if(message.id < 0) {
+                } else if (message.id < 0) {
 
                     message.prependTo(self.$el);
 
@@ -1284,14 +1309,17 @@ openerp.mail = function(session) {
          * Each message is send to his parent object (or parent thread flat mode) for creating the object message.
          * @param : {Array} datas from calling RPC to "message_read"
          */
-        switch_new_message: function(records) {
+        switch_new_message: function (records) {
             var self=this;
-            _(records).each(function(record){
+            _(records).each(function (record) {
                 var thread = self.browse_thread({
                     'id': record.ancestor_id, 
                     'default_return_top_thread':true
                 });
-                thread.create_message_object( record );
+                // create object and attach to the thread object
+                var message = thread.create_message_object( record );
+                // insert the message on dom
+                thread.insert_message( message );
             });
         },
 
@@ -1310,7 +1338,7 @@ openerp.mail = function(session) {
          */
         message_to_expandable: function (message) {
 
-            if(!this.thread_level || message.isDestroyed()) {
+            if (!this.thread_level || message.isDestroyed()) {
                 message.destroy();
                 return false;
             }
@@ -1330,7 +1358,7 @@ openerp.mail = function(session) {
 
                 msg_down.domain = ['|','|'].concat( msg_up.domain ).concat( message_dom ).concat( msg_down.domain );
 
-                if( !msg_down.max_limit ){
+                if ( !msg_down.max_limit ) {
                     msg_down.nb_messages += 1 + msg_up.nb_messages;
                 }
 
@@ -1354,7 +1382,7 @@ openerp.mail = function(session) {
                 msg_down.domain = ['|'].concat( msg_down.domain ).concat( message_dom );
                 
                 // it's maybe a message expandable for the max limit read message
-                if( !msg_down.max_limit ){
+                if ( !msg_down.max_limit ) {
                     msg_down.nb_messages++;
                 }
                 
@@ -1370,6 +1398,7 @@ openerp.mail = function(session) {
                     'thread_level': message.thread_level,
                     'ancestor_id': message.ancestor_id,
                     'domain': message_dom,
+                    'options': message.options,
                     }, {
                     'default_model': message.model || this.context.default_model,
                     'default_res_id': message.res_id || this.context.default_res_id,
@@ -1442,13 +1471,13 @@ openerp.mail = function(session) {
                 'message_ids': []
             }, options);
 
-            if(this.display_indented_thread === false) {
+            if (this.display_indented_thread === false) {
                 this.display_indented_thread = -1;
             }
-            if(this.show_reply_button === false) {
+            if (this.show_reply_button === false) {
                 this.show_reply_button = -1;
             }
-            if(this.show_read_unread_button === false) {
+            if (this.show_read_unread_button === false) {
                 this.show_read_unread_button = -1;
             }
             
@@ -1478,8 +1507,8 @@ openerp.mail = function(session) {
             this.thread.no_message();
             this.thread.message_fetch(null, null, this.options.message_ids);
 
-            if(this.options.show_compose_message) {
-                if(this.options.show_compact_message) {
+            if (this.options.show_compose_message) {
+                if (this.options.show_compact_message) {
                     this.thread.ComposeMessage.do_show_compact();
                 } else {
                     this.thread.ComposeMessage.do_hide_compact();
@@ -1487,8 +1516,8 @@ openerp.mail = function(session) {
             }
         },
 
-        bind_events: function(){
-            if(this.context['typeof_thread']!='other'){
+        bind_events: function () {
+            if (this.context['typeof_thread']!='other') {
                 $(document).scroll( this.thread.on_scroll );
                 $(window).resize( this.thread.on_scroll );
                 window.setTimeout( this.thread.on_scroll, 500 );
@@ -1510,23 +1539,23 @@ openerp.mail = function(session) {
     mail.RecordThread = session.web.form.AbstractField.extend({
         template: 'mail.record_thread',
 
-        init: function() {
+        init: function () {
             this._super.apply(this, arguments);
             this.options.domain = this.options.domain || [];
             this.options.context = {'default_model': 'mail.thread', 'default_res_id': false};
         },
 
-        start: function() {
+        start: function () {
             this._super.apply(this, arguments);
             // NB: check the actual_mode property on view to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
         },
 
-        _check_visibility: function() {
+        _check_visibility: function () {
             this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
-        render_value: function() {
+        render_value: function () {
             var self = this;
             if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
                 this.$('oe_mail_thread').hide();
@@ -1545,7 +1574,7 @@ openerp.mail = function(session) {
 
             var message_ids = this.getParent().fields.message_ids && this.getParent().fields.message_ids.get_value();
 
-            if(this.root){
+            if (this.root) {
                 this.root.destroy();
             }
             // create and render Thread widget
@@ -1625,7 +1654,7 @@ openerp.mail = function(session) {
          * @param {Array} contexts
          * @param {Array} groupbys
          */
-        do_searchview_search: function(domains, contexts, groupbys) {
+        do_searchview_search: function (domains, contexts, groupbys) {
             var self = this;
             this.rpc('/web/session/eval_domain_and_context', {
                 domains: domains || [],
@@ -1654,17 +1683,17 @@ openerp.mail = function(session) {
                 'show_reply_button': 10,
                 'show_read_unread_button': 11,
                 'show_compose_message': true,
-                'show_compact_message': true,
+                'show_compact_message': false,
                 }
             );
 
             return this.root.appendTo( this.$('.oe_mail_wall_threads:first') );
         },
 
-        bind_events: function(){
+        bind_events: function () {
             var self=this;
-            this.$("button.oe_write_full:first").click(function(){ self.root.thread.ComposeMessage.on_compose_fullmail(); });
-            this.$("button.oe_write_onwall:first").click(function(){ self.root.thread.on_compose_message(); });
+            this.$("button.oe_write_full:first").click(function () { self.root.thread.ComposeMessage.on_compose_fullmail(); });
+            this.$("button.oe_write_onwall:first").click(function () { self.root.thread.on_compose_message(); });
         }
     });
 
@@ -1690,13 +1719,13 @@ openerp.mail = function(session) {
             };
         },
 
-        start: function(parent, params) {
+        start: function (parent, params) {
             var self = this;
             this.$el.on('click', 'button', self.on_compose_message );
             this._super(parent, params);
         },
 
-        on_compose_message: function(event){
+        on_compose_message: function (event) {
             event.stopPropagation();
             var action = {
                 type: 'ir.actions.act_window',
@@ -1718,7 +1747,7 @@ openerp.mail = function(session) {
     });
 
     session.web.UserMenu = session.web.UserMenu.extend({
-        start: function(parent, params) {
+        start: function (parent, params) {
             var render = new session.web.ComposeMessageTopButton();
             render.insertAfter(this.$el);
             this._super(parent, params);
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 0f0362e84ce..d60ca89da2e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -211,7 +211,7 @@
                 </div>
                 <!-- message itself -->
                 <div class="oe_msg_content">
-                    <h1 t-if="widget.subject" class="oe_msg_title">
+                    <h1 t-if="widget.subject and !widget.thread_level" class="oe_msg_title">
                         <t t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index b68aae14521..b93f6eea7a9 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -157,11 +157,7 @@ class mail_compose_message(osv.TransientModel):
         if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)) and message_data.subject:
             reply_subject = "%s %s" % (re_prefix, reply_subject)
         # create the reply in the body
-        reply_body = _('<div>On %(date)s, %(sender_name)s wrote:<blockquote>%(body)s</blockquote></div>') % {
-            'date': message_data.date if message_data.date else '',
-            'sender_name': message_data.author_id.name,
-            'body': message_data.body,
-            }
+        reply_body = (context and context.get('default_body') or '')
         # get partner_ids from original message
         partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else []
 

From 6966509c6eaec94965370f75780e0005a23bb1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 13:30:48 +0200
Subject: [PATCH 074/106] [IMP] mail_message: partner_ids now holds only
 specific destination partners. Partners + followers is now stored into
 notified_partner_ids. Added a from field on mail_message, holding the email
 address of the sender, in case of an incoming email message that cannot be
 linked to a partner.

bzr revid: tde@openerp.com-20121025113048-5f1ob8ligqzb52gu
---
 addons/email_template/tests/test_mail.py     | 11 ++-
 addons/mail/mail_message.py                  | 73 ++++++++++----------
 addons/mail/mail_thread.py                   | 11 ++-
 addons/mail/static/src/js/mail.js            |  1 -
 addons/mail/tests/test_mail.py               | 18 ++---
 addons/mail/tests/test_mail_access_rights.py | 25 ++++---
 6 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 69afd5bc167..7af05f38b0e 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -165,11 +165,8 @@ class test_message_compose(test_mail.TestMailMockups):
         self.assertEqual(message_pigs.body, _body_html1, 'mail.message body on Pigs incorrect')
         self.assertEqual(message_bird.body, _body_html2, 'mail.message body on Bird incorrect')
         # Test: partner_ids: p_a_id (default) + 3 newly created partners
-        message_pigs_pids = [partner.id for partner in message_pigs.partner_ids]
-        message_bird_pids = [partner.id for partner in message_bird.partner_ids]
+        message_pigs_pids = [partner.id for partner in message_pigs.notified_partner_ids]
+        message_bird_pids = [partner.id for partner in message_bird.notified_partner_ids]
         partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])])
-        self.assertEqual(len(message_pigs_pids), len(partner_ids), 'mail.message on pigs incorrect number of partner_ids')
-        self.assertEqual(set(message_pigs_pids), set(partner_ids), 'mail.message on pigs incorrect number of partner_ids')
-
-        self.assertEqual(len(message_bird_pids), len(partner_ids), 'mail.message on bird partner_ids incorrect')
-        self.assertEqual(set(message_bird_pids), set(partner_ids), 'mail.message on bird partner_ids incorrect')
+        self.assertEqual(set(message_pigs_pids), set(partner_ids), 'mail.message on pigs incorrect number of notified_partner_ids')
+        self.assertEqual(set(message_bird_pids), set(partner_ids), 'mail.message on bird notified_partner_ids incorrect')
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index c6895c3acc1..37b37ca2881 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -115,8 +115,13 @@ class mail_message(osv.Model):
                         ], 'Type',
             help="Message type: email for email message, notification for system "\
                  "message, comment for other messages such as user replies"),
-        'author_id': fields.many2one('res.partner', 'Author', required=True),
-        'partner_ids': fields.many2many('res.partner', 'mail_notification', 'message_id', 'partner_id', 'Recipients'),
+        'from': fields.char('From',
+            help="Email address of the sender, to use if it does not match any partner."),
+        'author_id': fields.many2one('res.partner', 'Author',
+            help="Partner that did write the message. If not set, try to use the From field instead."),
+        'partner_ids': fields.many2many('res.partner', string='Recipients'),
+        'notified_partner_ids': fields.many2many('res.partner', 'mail_notification',
+            'message_id', 'partner_id', 'Recipients'),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel',
             'message_id', 'attachment_id', 'Attachments'),
         'parent_id': fields.many2one('mail.message', 'Parent Message', select=True, ondelete='set null', help="Initial thread message."),
@@ -201,6 +206,9 @@ class mail_message(osv.Model):
         is_author = False
         if message['author_id']:
             is_author = message['author_id'][0] == self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+            author_id = message['author_id']
+        elif message['from']:
+            author_id = (0, message['from'])
 
         has_voted = False
         if uid in message.get('vote_user_ids'):
@@ -210,9 +218,9 @@ class mail_message(osv.Model):
         if uid in message.get('favorite_user_ids'):
             is_favorite = True
 
-        is_private = False
+        is_private = True
         if message.get('model') and message.get('res_id'):
-            is_private = True
+            is_private = False
 
         try:
             attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, message['attachment_ids'], context=context)]
@@ -236,9 +244,8 @@ class mail_message(osv.Model):
             'record_name': message['record_name'],
             'subject': message['subject'],
             'date': message['date'],
-            'author_id': message['author_id'],
+            'author_id': author_id,
             'is_author': is_author,
-            # TDE note: is this useful ? to check
             'partner_ids': partner_ids,
             'ancestor_id': False,
             'vote_nb': len(message['vote_user_ids']),
@@ -463,11 +470,11 @@ class mail_message(osv.Model):
         author_ids, partner_ids, allowed_ids = set([]), set([]), set([])
         model_ids = {}
 
-        messages = super(mail_message, self).read(cr, uid, ids, ['author_id', 'model', 'res_id', 'partner_ids'], context=context)
+        messages = super(mail_message, self).read(cr, uid, ids, ['author_id', 'model', 'res_id', 'notified_partner_ids'], context=context)
         for message in messages:
             if message.get('author_id') and message.get('author_id')[0] == pid:
                 author_ids.add(message.get('id'))
-            elif pid in message.get('partner_ids'):
+            elif pid in message.get('notified_partner_ids'):
                 partner_ids.add(message.get('id'))
             elif message.get('model') and message.get('res_id'):
                 model_ids.setdefault(message.get('model'), {}).setdefault(message.get('res_id'), set()).add(message.get('id'))
@@ -615,40 +622,36 @@ class mail_message(osv.Model):
     # Messaging API
     #------------------------------------------------------
 
-    def _notify_followers(self, cr, uid, newid, message, context=None):
-        """ Add the related record followers to the destination partner_ids.
-        """
-        partners_to_notify = set([])
-        # message has no subtype_id: pure log message -> no partners, no one notified
-        if not message.subtype_id:
-            message.write({'partner_ids': [5]})
-            return True
-        # all partner_ids of the mail.message have to be notified
-        if message.partner_ids:
-            partners_to_notify |= set(partner.id for partner in message.partner_ids)
-        # all followers of the mail.message document have to be added as partners and notified
-        if message.model and message.res_id:
-            fol_obj = self.pool.get("mail.followers")
-            fol_ids = fol_obj.search(cr, uid, [('res_model', '=', message.model), ('res_id', '=', message.res_id), ('subtype_ids', 'in', message.subtype_id.id)], context=context)
-            fol_objs = fol_obj.browse(cr, uid, fol_ids, context=context)
-            extra_notified = set(fol.partner_id.id for fol in fol_objs)
-            missing_notified = extra_notified - partners_to_notify
-            if missing_notified:
-                self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, p_id) for p_id in missing_notified]}, context=context)
-
     def _notify(self, cr, uid, newid, context=None):
         """ Add the related record followers to the destination partner_ids if is not a private message.
             Call mail_notification.notify to manage the email sending
         """
-        message = self.browse(cr, uid, newid, context=context)
-        if message.model and message.res_id:
-            self._notify_followers(cr, uid, newid, message, context=context)
+        message = self.read(cr, uid, newid, ['model', 'res_id', 'author_id', 'subtype_id', 'partner_ids'], context=context)
 
+        partners_to_notify = set([])
+        # message has no subtype_id: pure log message -> no partners, no one notified
+        if not message.get('subtype_id'):
+            return True
+        # all partner_ids of the mail.message have to be notified
+        if message.get('partner_ids'):
+            partners_to_notify |= set(message.get('partner_ids'))
+        # all followers of the mail.message document have to be added as partners and notified
+        if message.get('model') and message.get('res_id'):
+            fol_obj = self.pool.get("mail.followers")
+            fol_ids = fol_obj.search(cr, uid, [
+                ('res_model', '=', message.get('model')),
+                ('res_id', '=', message.get('res_id')),
+                ('subtype_ids', 'in', message.get('subtype_id')[0])
+                ], context=context)
+            fol_objs = fol_obj.read(cr, uid, fol_ids, ['partner_id'], context=context)
+            partners_to_notify |= set(fol['partner_id'][0] for fol in fol_objs)
         # add myself if I wrote on my wall, otherwise remove myself author
-        if ((message.model == "res.partner" and message.res_id == message.author_id.id)):
-            self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, message.author_id.id)]}, context=context)
+        if message.get('author_id') and message.get('model') == "res.partner" and message.get('res_id') == message.get('author_id')[0]:
+            partners_to_notify |= set([message.get('author_id')[0]])
         else:
-            self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(3, message.author_id.id)]}, context=context)
+            partners_to_notify = partners_to_notify - set([message.get('author_id')[0]])
+        if partners_to_notify:
+            self.write(cr, SUPERUSER_ID, [newid], {'notified_partner_ids': [(4, p_id) for p_id in partners_to_notify]}, context=context)
 
         self.pool.get('mail.notification')._notify(cr, uid, newid, context=context)
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index e88e817addc..2692049c661 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -554,7 +554,10 @@ class mail_thread(osv.AbstractModel):
                                       ('file2', 'bytes')}
                     }
         """
-        msg_dict = {}
+        msg_dict = {
+            'type': 'email',
+            'subtype': 'mail.mt_comment',
+        }
         if not isinstance(message, Message):
             if isinstance(message, unicode):
                 # Warning: message_from_string doesn't always work correctly on unicode,
@@ -581,6 +584,8 @@ class mail_thread(osv.AbstractModel):
             author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context)
             if author_ids:
                 msg_dict['author_id'] = author_ids[0]
+            else:
+                msg_dict['from'] = message.get('from')
         partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context)
         msg_dict['partner_ids'] = partner_ids
 
@@ -690,14 +695,14 @@ class mail_thread(osv.AbstractModel):
         return mail_message.create(cr, uid, values, context=context)
 
     def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
-                        subtype=None, parent_id=False, attachment_ids=None, context=None):
+                        parent_id=False, attachment_ids=None, context=None):
         """ Wrapper on message_post, used only in Chatter (JS). The purpose is
             to handle attachments.
 
             # TDE FIXME: body is plaintext: convert it into html
         """
         new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
-                        subtype=subtype, parent_id=parent_id, context=context)
+                        subtype='mail.mt_comment', parent_id=parent_id, context=context)
 
         # HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
         if attachment_ids:
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b385e6bc9ec..0de1699ed5d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -339,7 +339,6 @@ openerp.mail = function(session) {
                         mail.ChatterUtils.get_text2html(body), 
                         false, 
                         'comment', 
-                        'mail.mt_comment',
                         this.context.default_parent_id, 
                         attachments,
                         this.parent_thread.context
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 8bfd5d44494..d5092002c57 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -365,11 +365,11 @@ class test_mail(TestMailMockups):
             # the html2plaintext uses etree or beautiful soup, so the result may be slighly different
             # depending if you have installed beautiful soup.
             self.assertIn(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils\n', 'sent_email body_alternative is incorrect')
-        # Test: mail_message: partner_ids = group followers
-        message_pids = set([partner.id for partner in message.partner_ids])
+        # Test: mail_message: notified_partner_ids = group followers
+        message_pids = set([partner.id for partner in message.notified_partner_ids])
         test_pids = set([p_b_id, p_c_id])
         self.assertEqual(test_pids, message_pids, 'mail.message partners incorrect')
-        # Test: notification linked to this message = group followers = partner_ids
+        # Test: notification linked to this message = group followers = notified_partner_ids
         notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
         notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
         self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
@@ -398,11 +398,11 @@ class test_mail(TestMailMockups):
             self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
             self.assertIn(_mail_body2, sent_email['body'], 'sent_email body incorrect')
             self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect')
-        # Test: mail_message: partner_ids = group followers
-        message_pids = set([partner.id for partner in message.partner_ids])
+        # Test: mail_message: notified_partner_ids = group followers
+        message_pids = set([partner.id for partner in message.notified_partner_ids])
         test_pids = set([p_b_id, p_c_id, p_d_id])
         self.assertEqual(message_pids, test_pids, 'mail.message partners incorrect')
-        # Test: notifications linked to this message = group followers = partner_ids
+        # Test: notifications linked to this message = group followers = notified_partner_ids
         notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
         notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
         self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
@@ -466,12 +466,12 @@ class test_mail(TestMailMockups):
         # Test: mail.message: subject, body inside pre
         self.assertEqual(message.subject,  False, 'mail.message incorrect subject')
         self.assertEqual(message.body, _msg_body, 'mail.message incorrect body')
-        # Test: mail.message: partner_ids = entries in mail.notification: group_pigs fans (a, b) + mail.compose.message partner_ids (c, d)
-        msg_pids = [partner.id for partner in message.partner_ids]
+        # Test: mail.message: notified_partner_ids = entries in mail.notification: group_pigs fans (a, b) + mail.compose.message partner_ids (c, d)
+        msg_pids = [partner.id for partner in message.notified_partner_ids]
         test_pids = [p_b_id, p_c_id, p_d_id]
         notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
         self.assertEqual(len(notif_ids), 3, 'mail.message: too much notifications created')
-        self.assertEqual(set(msg_pids), set(test_pids), 'mail.message partner_ids incorrect')
+        self.assertEqual(set(msg_pids), set(test_pids), 'mail.message notified_partner_ids incorrect')
 
         # ----------------------------------------
         # CASE2: reply to last comment with attachments
diff --git a/addons/mail/tests/test_mail_access_rights.py b/addons/mail/tests/test_mail_access_rights.py
index bcf499de799..7b90e07b9b5 100644
--- a/addons/mail/tests/test_mail_access_rights.py
+++ b/addons/mail/tests/test_mail_access_rights.py
@@ -56,29 +56,32 @@ class test_mail_access_rights(test_mail.TestMailMockups):
         cr, uid, group_pigs_id = self.cr, self.uid, self.group_pigs_id
         partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
         user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
+        # Data: comment subtype for mail.message creation
+        ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'mail', 'mt_comment')
+        subtype_id = ref and ref[1] or False
 
         # Data: Birds group, private
         group_birds_id = self.mail_group.create(self.cr, self.uid, {'name': 'Birds', 'public': 'private'})
         # Data: raoul is member of Pigs
         self.mail_group.message_subscribe(cr, uid, [group_pigs_id], [partner_raoul_id])
         # Data: various author_ids, partner_ids, documents
-        msg_id1 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A'})
-        msg_id2 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A+B', 'partner_ids': [(6, 0, [partner_bert_id])]})
-        msg_id3 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A Pigs', 'model': 'mail.group', 'res_id': group_pigs_id})
-        msg_id4 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A+B Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'partner_ids': [(6, 0, [partner_bert_id])]})
-        msg_id5 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A+R Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'partner_ids': [(6, 0, [partner_raoul_id])]})
-        msg_id6 = self.mail_message.create(cr, uid, {'subject': 'Test', 'body': 'A Birds', 'model': 'mail.group', 'res_id': group_birds_id})
-        msg_id7 = self.mail_message.create(cr, user_bert_id, {'subject': 'Test', 'body': 'B'})
-        msg_id8 = self.mail_message.create(cr, user_bert_id, {'subject': 'Test', 'body': 'B+R', 'partner_ids': [(6, 0, [partner_raoul_id])]})
+        msg_id1 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A', 'subtype_id': subtype_id})
+        msg_id2 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A+B', 'partner_ids': [(6, 0, [partner_bert_id])], 'subtype_id': subtype_id})
+        msg_id3 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'subtype_id': subtype_id})
+        msg_id4 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A+B Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'partner_ids': [(6, 0, [partner_bert_id])], 'subtype_id': subtype_id})
+        msg_id5 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A+R Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'partner_ids': [(6, 0, [partner_raoul_id])], 'subtype_id': subtype_id})
+        msg_id6 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A Birds', 'model': 'mail.group', 'res_id': group_birds_id, 'subtype_id': subtype_id})
+        msg_id7 = self.mail_message.create(cr, user_bert_id, {'subject': '_Test', 'body': 'B', 'subtype_id': subtype_id})
+        msg_id8 = self.mail_message.create(cr, user_bert_id, {'subject': '_Test', 'body': 'B+R', 'partner_ids': [(6, 0, [partner_raoul_id])], 'subtype_id': subtype_id})
 
         # Test: Bert: 2 messages that have Bert in partner_ids + 2 messages as author
-        msg_ids = self.mail_message.search(cr, user_bert_id, [('subject', 'like', 'Test')])
+        msg_ids = self.mail_message.search(cr, user_bert_id, [('subject', 'like', '_Test')])
         self.assertEqual(set([msg_id2, msg_id4, msg_id7, msg_id8]), set(msg_ids), 'mail_message search failed')
         # Test: Raoul: 3 messages on Pigs Raoul can read (employee can read group with default values), 0 on Birds (private group)
-        msg_ids = self.mail_message.search(cr, user_raoul_id, [('body', 'like', 'A')])
+        msg_ids = self.mail_message.search(cr, user_raoul_id, [('subject', 'like', '_Test'), ('body', 'like', 'A')])
         self.assertEqual(set([msg_id3, msg_id4, msg_id5]), set(msg_ids), 'mail_message search failed')
         # Test: Admin: all messages
-        msg_ids = self.mail_message.search(cr, uid, [('subject', 'like', 'Test')])
+        msg_ids = self.mail_message.search(cr, uid, [('subject', 'like', '_Test')])
         self.assertEqual(set([msg_id1, msg_id2, msg_id3, msg_id4, msg_id5, msg_id6, msg_id7, msg_id8]), set(msg_ids), 'mail_message search failed')
 
     def test_05_mail_message_read_access_rights(self):

From 0805371fa9e1f17816a638b6878f7d6629d926ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 25 Oct 2012 14:43:20 +0200
Subject: [PATCH 075/106] [IMP] mail: compose textarea auto-resizes, various
 small fixes

bzr revid: fva@openerp.com-20121025124320-ztzcdf4bkgjjs57h
---
 addons/mail/static/src/css/mail.css | 23 ++++++++------
 addons/mail/static/src/js/mail.js   |  5 +--
 addons/mail/static/src/xml/mail.xml | 49 +++++++++++++++--------------
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 36c56b161bd..921890926e6 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -37,6 +37,9 @@
     margin:1px;
     border-radius:2px;
 }
+.openerp .oe_mail .oe_msg .oe_subtle{
+    color: #B7B7D5;
+}
 .openerp .oe_mail .oe_msg_indented .oe_msg_center{
     margin-left:34px;
 }
@@ -58,14 +61,9 @@
 .openerp .oe_mail .oe_msg .oe_msg_footer{
     padding-left: 4px;
     overflow: hidden;
-    font-size: 11px;
     opacity:0.8;
     -webkit-transition: opacity 0.2s linear;
 }
-.openerp .oe_mail .oe_thread:hover .oe_msg_footer{
-    opacity: 1;
-    -webkit-transition: opacity 0.2s linear;
-}
 .openerp .oe_mail .oe_msg .oe_msg_content{
     display: block;
     overflow: hidden;
@@ -73,7 +71,7 @@
     padding-bottom:1px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_title{
-    font-size: 16px;
+    font-size: 13px;
     margin-bottom: 0px;
     margin-top: 2px;
 }
@@ -124,10 +122,11 @@
 }
 .openerp .oe_mail .oe_msg .oe_msg_content textarea{
     width: 100%;
-    height: 100%;
+    height: 32px;
     margin: 0px;
     padding: 0px;
     resize: vertical;
+    
     padding: 4px;
 }
 .openerp .oe_mail .oe_msg.oe_msg_composer_compact, .openerp .oe_mail .oe_msg.oe_msg_expandable{
@@ -220,11 +219,15 @@
     border: none;
     text-shadow: none;
 }
+.openerp .oe_mail .oe_attach_label{
+    color: #7C7BAD;
+    margin-left: -3px;
+}
 .openerp .oe_mail .oe_msg_footer .oe_attachment_file .oe_form_binary_file{
     display: inline-block;
-    margin-left: -23px;
-    height: 24px;
-    width: 24px;
+    margin-left: -47px;
+    height: 28px;
+    width: 52px;
     margin-top: -6px;
 }
 .openerp .oe_mail .oe_mail_list_recipients{
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 1adcbc4ad4c..1779d1a6562 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -293,6 +293,7 @@ openerp.mail = function(session) {
                 /* stack for don't close the compose form if the user click on a button */
                 this.$render_expandable.on('focus, mouseup', 'textarea', function () { self.stay_open = false; });
                 this.$render_expandable.on('mousedown', function () { self.stay_open = true; });
+                this.$render_expandable.find('textarea').autosize();
             }
         },
 
@@ -1662,8 +1663,8 @@ openerp.mail = function(session) {
 
         bind_events: function(){
             var self=this;
-            this.$("button.oe_write_full:first").click(function(){ self.root.thread.ComposeMessage.on_compose_fullmail(); });
-            this.$("button.oe_write_onwall:first").click(function(){ self.root.thread.on_compose_message(); });
+            this.$(".oe_write_full").click(function(){ self.root.thread.ComposeMessage.on_compose_fullmail(); });
+            this.$(".oe_write_onwall").click(function(){ self.root.thread.on_compose_message(); });
         }
     });
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 96a3f578663..8d868241132 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -15,16 +15,17 @@
         for main thread composition form in document form view.
         -->
     <t t-name="mail.compose_message">
-        <div class="oe_msg oe_msg_composer">
+        <div class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_composer">
             <div class="oe_msg_left">
                 <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
                     <t t-call="mail.thread.list_recipients"/>
-                    <textarea class="field_text" placeholder=""/>
-                </div><div class="oe_msg_footer">
-                    <div class="oe_msg_attachment_list"/>
+                    <textarea class="field_text"></textarea>
+                </div>
+                <div class="oe_msg_footer">
+                    <div class="oe_msg_attachment_list"></div>
                     <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
                     <!--<a class="oe_cancel oe_e">X</a>-->
@@ -40,7 +41,7 @@
         mail.compose_message when focus on textarea
         -->
     <t t-name="mail.compose_message.compact">
-        <div class="oe_msg oe_msg_composer_compact">
+        <div class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_composer_compact">
             <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
     </t>
@@ -53,7 +54,8 @@
         <span class="oe_attachment_file">
             <span class="oe_add">
                 <!-- uploader of file -->
-                <button class="oe_attach"><span class="oe_e">'</span></button>
+                <button class="oe_attach"><span class="oe_e">'</span></button> 
+                <span class='oe_attach_label'>File</span>
                 <t t-call="HiddenInputFile">
                     <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
                     <t t-set="fileupload_action">/web/binary/upload_attachment</t>
@@ -162,10 +164,10 @@
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message
                     </button>
-                    or
-                    <button type="button" class="oe_write_onwall" help="Your followers can read this message">
-                        Write to your followers
-                    </button>
+                    <span class='oe_alternative'>
+                        or
+                        <a href='#'  class='oe_write_onwall oe_bold' help='Your followers can read this message'>Write to your followers</a>
+                    </span>
                 </td>
             </tr>
           </tbody>
@@ -227,12 +229,14 @@
                     </t>
                 </div>
                 <div class="oe_msg_footer">
-                    from <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a> 
+                    <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
                         <a t-if="widget.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
                             <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
                             <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
                         </a>
+                    <span class='oe_subtle'>•</span>
                     <t t-call="mail.thread.message.vote"/>
                 </div>
             </div>
@@ -241,7 +245,7 @@
 
     <!-- expandable message layout -->
     <t t-name="mail.thread.expandable">
-        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
+        <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type} oe_msg_unread">
             <div class="oe_msg_content oe_msg_more_message">
                 <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">load one more message</a>
                 <a t-if="widget.nb_messages !== 1" class="oe_msg_fetch_more">load <t t-raw="widget.nb_messages" /> more messages</a>
@@ -263,27 +267,24 @@
         Template used to display Like/Unlike in a mail.message
     -->
     <span t-name="mail.thread.message.vote">
-        <!--
-        <span class="oe_left oe_mail_vote_count">
+        
+        <span class="oe_mail_vote_count">
             <t t-if='widget.has_voted'>
                 You
             </t>
             <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
                 <t t-if='widget.has_voted'> and </t>
+                <t t-raw="(widget.vote_nb - (widget.has_voted ? 1 : 0))"/>
                 <t t-esc="widget.vote_nb"/> people
             </t>
-            <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
-                <t t-raw="(widget.vote_nb - (widget.has_voted ? 1 : 0))"/>
-                concur
+            <t t-if='widget.vote_nb'>
+                like
             </t>
         </span>
-        <button t-attf-class="oe_msg_vote oe_tag">
-            <span>
-                <t t-if="!widget.has_voted">Concur</t>
-                <t t-if="widget.has_voted">Respectfully disagree</t>
-            </span>
-        </button>
-        -->
+        <a href='#' t-attf-class="oe_msg_vote">
+            <t t-if="!widget.has_voted">like</t>
+            <t t-if="widget.has_voted">unlike</t>
+        </a>
     </span>
 
     <!-- mail.thread.message.star

From 2a50ee0fde694ee40239c9bfbb31fa4ad077c3fc Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 25 Oct 2012 15:48:19 +0200
Subject: [PATCH 076/106] [IMP] mail: Re reply

bzr revid: chm@openerp.com-20121025134819-3iwgsqziivkz8d0z
---
 addons/mail/mail_thread.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 8269049f917..685f9781cc9 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -700,7 +700,8 @@ class mail_thread(osv.AbstractModel):
 
         if not subject and parent_id:
             parent = mail_message.read(cr, uid, parent_id, ['subject'], context=context)
-            subject = 'Re: ' + parent['subject']
+            if not parent['subject'].startswith('Re:')
+                subject = 'Re: ' + parent['subject']
 
         new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
                         subtype=subtype, parent_id=parent_id, context=context)

From e261dd977e396b0f5aa9d2f22b6f18f87563d397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 15:49:37 +0200
Subject: [PATCH 077/106] [FIX] mail: when upgrading to mail, add subtype_id
 mt_comment to default subscription.

bzr revid: tde@openerp.com-20121025134937-u3gref549xi4c2sb
---
 addons/mail/res_users.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 54b8a76703f..d62a2424586 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -59,15 +59,17 @@ class res_users(osv.Model):
         # create aliases for all users and avoid constraint errors
         self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
             self._columns['alias_id'], 'login', alias_force_key='id', context=context)
-        # make already existing users follow themselves, using SQL to avoid using the ORM during the auto_init
+        # make already existing users follow themselves, using SQL to avoid using the ORM during the auto_init, and fetch the mail.mt_comment subtype
+        ref = self.pool.get('ir.model.data').get_object_reference(cr, SUPERUSER_ID, 'mail', 'mt_comment')
+        subtype_id = ref and ref[0] or False
         cr.execute("""  SELECT p.id FROM res_partner p
                         LEFT JOIN mail_followers n
                         ON (n.partner_id = p.id AND n.res_model = 'res.partner' AND n.res_id = p.id)
                         WHERE n.id IS NULL
                     """)
-        params = [(res[0], res[0]) for res in cr.fetchall()]
-        cr.executemany("""  INSERT INTO mail_followers (partner_id, res_model, res_id)
-                            VALUES (%s, 'res.partner', %s)
+        params = [(res[0], res[0], subtype_id) for res in cr.fetchall()]
+        cr.executemany("""  INSERT INTO mail_followers (partner_id, res_model, res_id, subtype_id)
+                            VALUES (%s, 'res.partner', %s, %s)
                         """, params)
 
     def create(self, cr, uid, data, context=None):

From 82398c12c86fe482a9969862bbc30ad186f6d093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 15:50:20 +0200
Subject: [PATCH 078/106] [FIX] mail: mail_message from field renamed to
 email_from, because of reserved word. Various fixes.

bzr revid: tde@openerp.com-20121025135020-83h1cybp6um53uq5
---
 addons/mail/mail_message.py       | 23 +++++++++++++----------
 addons/mail/mail_message_view.xml |  2 ++
 addons/mail/mail_thread.py        |  5 +++--
 addons/mail/tests/test_mail.py    | 24 ++++++++++++++++++++++--
 4 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 37b37ca2881..94cc8568542 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -46,7 +46,7 @@ class mail_message(osv.Model):
     _order = 'id desc'
 
     _message_read_limit = 10
-    _message_read_fields = ['id', 'parent_id', 'model', 'res_id', 'body', 'subject', 'date', 'to_read',
+    _message_read_fields = ['id', 'parent_id', 'model', 'res_id', 'body', 'subject', 'date', 'to_read', 'email_from',
         'type', 'vote_user_ids', 'attachment_ids', 'author_id', 'partner_ids', 'record_name', 'favorite_user_ids']
     _message_record_name_length = 18
     _message_read_more_limit = 1024
@@ -115,7 +115,7 @@ class mail_message(osv.Model):
                         ], 'Type',
             help="Message type: email for email message, notification for system "\
                  "message, comment for other messages such as user replies"),
-        'from': fields.char('From',
+        'email_from': fields.char('From',
             help="Email address of the sender, to use if it does not match any partner."),
         'author_id': fields.many2one('res.partner', 'Author',
             help="Partner that did write the message. If not set, try to use the From field instead."),
@@ -207,8 +207,8 @@ class mail_message(osv.Model):
         if message['author_id']:
             is_author = message['author_id'][0] == self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
             author_id = message['author_id']
-        elif message['from']:
-            author_id = (0, message['from'])
+        elif message['email_from']:
+            author_id = (0, message['email_from'])
 
         has_voted = False
         if uid in message.get('vote_user_ids'):
@@ -397,9 +397,11 @@ class mail_message(osv.Model):
         if ids is None:
             ids = self.search(cr, uid, domain, context=context, limit=limit)
         for message in self.read(cr, uid, ids, self._message_read_fields, context=context):
+            message_id = message['id']
+
             # if not in tree and not in message_loaded list
-            if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
-                read_messages[message.get('id')] = message
+            if not message_id in read_messages and not message_id in message_unload_ids:
+                read_messages[message_id] = message
                 message_list.append(self._message_get_dict(cr, uid, message, context=context))
 
                 # get the older ancestor the user can read, update its ancestor field
@@ -412,8 +414,8 @@ class mail_message(osv.Model):
                     message = parent
                     parent = self._get_parent(cr, uid, message, context=context)
                 # if in thread: add its ancestor to the list of messages
-                if not read_messages.get(message.get('id')) and message.get('id') not in message_unload_ids:
-                    read_messages[message.get('id')] = message
+                if not message['id'] in read_messages and not message['id'] in message_unload_ids:
+                    read_messages[message['id']] = message
                     message_list.append(self._message_get_dict(cr, uid, message, context=context))
 
         # get the child expandable messages for the tree
@@ -645,11 +647,12 @@ class mail_message(osv.Model):
                 ], context=context)
             fol_objs = fol_obj.read(cr, uid, fol_ids, ['partner_id'], context=context)
             partners_to_notify |= set(fol['partner_id'][0] for fol in fol_objs)
-        # add myself if I wrote on my wall, otherwise remove myself author
+        # when writing to a wall
         if message.get('author_id') and message.get('model') == "res.partner" and message.get('res_id') == message.get('author_id')[0]:
             partners_to_notify |= set([message.get('author_id')[0]])
-        else:
+        elif message.get('author_id'):
             partners_to_notify = partners_to_notify - set([message.get('author_id')[0]])
+
         if partners_to_notify:
             self.write(cr, SUPERUSER_ID, [newid], {'notified_partner_ids': [(4, p_id) for p_id in partners_to_notify]}, context=context)
 
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 4677beee511..d78db7fce58 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -29,6 +29,7 @@
                             <group>
                                 <field name="subject"/>
                                 <field name="author_id"/>
+                                <field name="email_from"/>
                                 <field name="date"/>
                                 <field name="type"/>
                                 <field name="subtype_id"/>
@@ -38,6 +39,7 @@
                                 <field name="res_id"/>
                                 <field name="parent_id"/>
                                 <field name="partner_ids" widget="many2many_tags"/>
+                                <field name="notified_partner_ids" widget="many2many_tags"/>
                             </group>
                         </group>
                         <field name="body"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 2692049c661..7d5d4728911 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -557,6 +557,7 @@ class mail_thread(osv.AbstractModel):
         msg_dict = {
             'type': 'email',
             'subtype': 'mail.mt_comment',
+            'author_id': False,
         }
         if not isinstance(message, Message):
             if isinstance(message, unicode):
@@ -575,7 +576,7 @@ class mail_thread(osv.AbstractModel):
         if 'Subject' in message:
             msg_dict['subject'] = decode(message.get('Subject'))
 
-        # Envelope fields not stored in  mail.message but made available for message_new()
+        # Envelope fields not stored in mail.message but made available for message_new()
         msg_dict['from'] = decode(message.get('from'))
         msg_dict['to'] = decode(message.get('to'))
         msg_dict['cc'] = decode(message.get('cc'))
@@ -585,7 +586,7 @@ class mail_thread(osv.AbstractModel):
             if author_ids:
                 msg_dict['author_id'] = author_ids[0]
             else:
-                msg_dict['from'] = message.get('from')
+                msg_dict['email_from'] = message.get('from')
         partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context)
         msg_dict['partner_ids'] = partner_ids
 
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index d5092002c57..b83f55e3973 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -143,7 +143,7 @@ class test_mail(TestMailMockups):
         group_employee_id = group_employee_ref and group_employee_ref[1] or False
         # Test users
         self.user_raoul_id = self.res_users.create(cr, uid,
-            {'name': 'Raoul Grosbedon', 'login': 'raoul', 'groups_id': [(6, 0, [group_employee_id])]})
+            {'name': 'Raoul Grosbedon', 'email': 'raoul@raoul.fr', 'login': 'raoul', 'groups_id': [(6, 0, [group_employee_id])]})
         self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
         self.user_admin = self.res_users.browse(cr, uid, uid)
 
@@ -167,7 +167,7 @@ class test_mail(TestMailMockups):
 
     def test_00_message_process(self):
         """ Testing incoming emails processing. """
-        cr, uid = self.cr, self.uid
+        cr, uid, user_raoul = self.cr, self.uid, self.user_raoul
         # Incoming mail creates a new mail_group "frogs"
         self.assertEqual(self.mail_group.search(cr, uid, [('name', '=', 'frogs')]), [])
         mail_frogs = MAIL_TEMPLATE.format(to='groups@example.com, other@gmail.com', subject='frogs', extra='')
@@ -205,6 +205,26 @@ class test_mail(TestMailMockups):
         self.assertEqual(new_mail.body, '\n<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>\n',
                          'plaintext mail incorrectly parsed')
 
+        # Do: post a new message, with a known partner
+        test_msg_id = '<deadcafe.1337-2@smtp.agrolait.com>'
+        TEMPLATE_MOD = MAIL_TEMPLATE_PLAINTEXT.replace('Sylvie Lelitre <sylvie.lelitre@agrolait.com>', user_raoul.email)
+        mail_new = TEMPLATE_MOD.format(to='Friendly Frogs <group+frogs@example.com>', subject='extra news', extra='', msg_id=test_msg_id)
+        self.mail_thread.message_process(cr, uid, None, mail_new)
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id', '=', test_msg_id)])[0])
+        # Test: author_id set, not email_from
+        self.assertEqual(new_mail.author_id, user_raoul.partner_id, 'message process wrong author found')
+        self.assertFalse(new_mail.email_from, 'message process should not set the email_from when an author is found')
+
+        # Do: post a new message, with a unknown partner
+        test_msg_id = '<deadcafe.1337-3@smtp.agrolait.com>'
+        TEMPLATE_MOD = MAIL_TEMPLATE_PLAINTEXT.replace('Sylvie Lelitre <sylvie.lelitre@agrolait.com>', '_abcd_')
+        mail_new = TEMPLATE_MOD.format(to='Friendly Frogs <group+frogs@example.com>', subject='super news', extra='', msg_id=test_msg_id)
+        self.mail_thread.message_process(cr, uid, None, mail_new)
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id', '=', test_msg_id)])[0])
+        # Test: author_id set, not email_from
+        self.assertFalse(new_mail.author_id, 'message process shnould not have found a partner for _abcd_ email address')
+        self.assertIn('_abcd_', new_mail.email_from, 'message process should set en email_from when not finding a partner_id')
+
     def test_10_followers_function_field(self):
         """ Tests designed for the many2many function field 'follower_ids'.
             We will test to perform writes using the many2many commands 0, 3, 4,

From 95ce9afb676c03cb508e8789425e8b0b9a7431e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 17:11:23 +0200
Subject: [PATCH 079/106] [IMP] mail: mail_message.record_name is now
 store=True, removing a lot of access right checks and document reads. Also
 forced the parent_id to be the first ancestor of a thread.

bzr revid: tde@openerp.com-20121025151123-s3qiodtf8xm7huvq
---
 addons/mail/mail_message.py | 16 ++++++----------
 addons/mail/mail_thread.py  |  8 ++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 94cc8568542..c310969cfc0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -57,17 +57,13 @@ class mail_message(osv.Model):
         return name[:self._message_record_name_length] + '...'
 
     def _get_record_name(self, cr, uid, ids, name, arg, context=None):
-        """ Return the related document name, using name_get. It is included in
-            a try/except statement, because if uid cannot read the related
-            document, he should see a void string instead of crashing. """
+        """ Return the related document name, using name_get. It is done using
+            SUPERUSER_ID, to be sure to have the record name correctly stored. """
         result = dict.fromkeys(ids, False)
         for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):
-            if not message['model'] or not message['res_id']:
+            if not message.get('model') or not message.get('res_id'):
                 continue
-            try:
-                result[message['id']] = self._shorten_name(self.pool.get(message['model']).name_get(cr, uid, [message['res_id']], context=context)[0][1])
-            except (orm.except_orm, osv.except_osv):
-                pass
+            result[message['id']] = self._shorten_name(self.pool.get(message['model']).name_get(cr, SUPERUSER_ID, [message['res_id']], context=context)[0][1])
         return result
 
     def _get_to_read(self, cr, uid, ids, name, arg, context=None):
@@ -128,8 +124,8 @@ class mail_message(osv.Model):
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
         'model': fields.char('Related Document Model', size=128, select=1),
         'res_id': fields.integer('Related Document ID', select=1),
-        'record_name': fields.function(_get_record_name, type='string',
-            string='Message Record Name',
+        'record_name': fields.function(_get_record_name, type='char',
+            store=True, string='Message Record Name',
             help="Name get of the related document."),
         'notification_ids': fields.one2many('mail.notification', 'message_id', 'Notifications'),
         'subject': fields.char('Subject'),
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7d5d4728911..cc9d7d3627f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -676,6 +676,14 @@ class mail_thread(osv.AbstractModel):
         if self._mail_flat_thread and not parent_id and thread_id:
             message_ids = mail_message.search(cr, uid, ['&', ('res_id', '=', thread_id), ('model', '=', model)], context=context, order="id ASC", limit=1)
             parent_id = message_ids and message_ids[0] or False
+        # we want to set a parent: force to set the parent_id to the oldest ancestor, to avoid having more than 1 level of thread
+        elif parent_id:
+            message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
+            _counter, _counter_max = 0, 200
+            while (message_ids and (_counter <= _counter_max)):
+                parent_id = message_ids[0]
+                message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
+                _counter += 1
 
         values = kwargs
         values.update({

From cfebd61a520a450c7940ee04b4400eb40a0c7be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 17:26:01 +0200
Subject: [PATCH 080/106] [REM] mail: removed trying to set a subtype when
 upgrading to mail.

bzr revid: tde@openerp.com-20121025152601-lksee1pkxnhtt63d
---
 addons/mail/res_users.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index d62a2424586..54b8a76703f 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -59,17 +59,15 @@ class res_users(osv.Model):
         # create aliases for all users and avoid constraint errors
         self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
             self._columns['alias_id'], 'login', alias_force_key='id', context=context)
-        # make already existing users follow themselves, using SQL to avoid using the ORM during the auto_init, and fetch the mail.mt_comment subtype
-        ref = self.pool.get('ir.model.data').get_object_reference(cr, SUPERUSER_ID, 'mail', 'mt_comment')
-        subtype_id = ref and ref[0] or False
+        # make already existing users follow themselves, using SQL to avoid using the ORM during the auto_init
         cr.execute("""  SELECT p.id FROM res_partner p
                         LEFT JOIN mail_followers n
                         ON (n.partner_id = p.id AND n.res_model = 'res.partner' AND n.res_id = p.id)
                         WHERE n.id IS NULL
                     """)
-        params = [(res[0], res[0], subtype_id) for res in cr.fetchall()]
-        cr.executemany("""  INSERT INTO mail_followers (partner_id, res_model, res_id, subtype_id)
-                            VALUES (%s, 'res.partner', %s, %s)
+        params = [(res[0], res[0]) for res in cr.fetchall()]
+        cr.executemany("""  INSERT INTO mail_followers (partner_id, res_model, res_id)
+                            VALUES (%s, 'res.partner', %s)
                         """, params)
 
     def create(self, cr, uid, data, context=None):

From 0f0fc9cd9762621cccbfdc6c7b81ea15836187fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 17:31:31 +0200
Subject: [PATCH 081/106] [IMP] mail: demo data: added a subtype_id to demo
 data; made a flat structure.

bzr revid: tde@openerp.com-20121025153131-ws1s84cuna13tc1e
---
 addons/mail/data/mail_demo.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 7bda32c002b..bda93fc485d 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -8,6 +8,7 @@
             <field name="body">Your monthly meal vouchers arrived. You can get them at Christine's office.
 This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</field>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
         </record>
 
         <record id="message_blogpost0_comment0" model="mail.message">
@@ -16,6 +17,7 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="body"><![CDATA[Great.]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
         </record>
 
         <record id="message_blogpost0_comment1" model="mail.message">
@@ -24,22 +26,25 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="body">Thanks, but where is Christine's office, if I may ask? (I'm new here)</field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
         </record>
 
         <record id="message_blogpost0_comment2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_employees"/>
+            <field name="body">Building B3, second floor on the right :-)</field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+        </record>
+
+        <record id="message_blogpost0_comment3" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
             <field name="body">Great news, I need to buy a new fridge, I think I can pay it with the eco-vouchers!</field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-        </record>
-
-        <record id="message_blogpost0_comment1_2" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_employees"/>
-            <field name="body">Building B3, second floor on the right :-)</field>
-            <field name="parent_id" ref="message_blogpost0_comment1"/>
-            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
         </record>
 
     </data>

From 3e36e6c88fdb52573f963cb8a0ddf37ee866bc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Oct 2012 17:42:15 +0200
Subject: [PATCH 082/106] [FIX] mail: fixed ancestor search in message_post.

bzr revid: tde@openerp.com-20121025154215-ue4tpe3cua7491no
---
 addons/mail/mail_thread.py     | 11 ++++++-----
 addons/mail/tests/test_mail.py |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index cc9d7d3627f..7ce3eb3afd8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -679,11 +679,12 @@ class mail_thread(osv.AbstractModel):
         # we want to set a parent: force to set the parent_id to the oldest ancestor, to avoid having more than 1 level of thread
         elif parent_id:
             message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
-            _counter, _counter_max = 0, 200
-            while (message_ids and (_counter <= _counter_max)):
-                parent_id = message_ids[0]
-                message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
-                _counter += 1
+            if message_ids:
+                _counter, _counter_max = 0, 200
+                message = mail_message.browse(cr, SUPERUSER_ID, message_ids[0], context=context)
+                while (message.parent_id and (_counter <= _counter_max)):
+                    message = message.parent_id
+                parent_id = message.id
 
         values = kwargs
         values.update({
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index b83f55e3973..a1e53c4ec68 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -436,6 +436,11 @@ class test_mail(TestMailMockups):
             self.assertIn((attach.name, attach.datas.decode('base64')), _attachments,
                 'mail.message attachment name / data incorrect')
 
+        # 3. Reply to the last message, check that its parent will be the first message
+        msg_id3 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Test', parent_id=msg_id2)
+        message = self.mail_message.browse(cr, uid, msg_id3)
+        self.assertEqual(message.parent_id.id, msg_id, 'message_post did not flatten the thread structure')
+
     def test_25_message_compose_wizard(self):
         """ Tests designed for the mail.compose.message wizard. """
         cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs

From e1bbbad62fde4eeb7897062a0d689b16aa87e201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 26 Oct 2012 10:00:05 +0200
Subject: [PATCH 083/106] [IMP] mail: ancestor_id -> back to parent_id;
 message_post force the parent to be the oldest ancestor.

bzr revid: tde@openerp.com-20121026080005-ns2vicwdksr515ll
---
 addons/mail/mail_followers.py | 13 ++++++++++++-
 addons/mail/mail_message.py   | 12 +++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 52d26ebb51b..5b024ee9b4d 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -131,7 +131,8 @@ class mail_notification(osv.Model):
 
     def _notify(self, cr, uid, msg_id, context=None):
         """ Send by email the notification depending on the user preferences """
-        context = context or {}
+        if context is None:
+            context = {}
         # mail_noemail (do not send email) or no partner_ids: do not send, return
         if context.get('mail_noemail'):
             return True
@@ -142,6 +143,16 @@ class mail_notification(osv.Model):
             return True
 
         mail_mail = self.pool.get('mail.mail')
+
+        # TMP about thread formation
+        if msg.parent_id.id:
+            # 1. fetch all messages that will form the thread as SUPERUSER, filtering will be done after
+            messages = self.pool.get('mail.message').message_read(cr, SUPERUSER_ID, None, domain=['|', ('id', 'in', [msg.id, msg.parent_id.id]), ('parent_id', '=', msg.parent_id.id)], context=context, limit=5, thread_level=1)
+            for message in messages:
+                print message['body'], message['id'], message['parent_id']
+
+        # END TMP
+
         # add signature
         body_html = msg.body
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index c310969cfc0..2e46162c3f6 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -243,7 +243,7 @@ class mail_message(osv.Model):
             'author_id': author_id,
             'is_author': is_author,
             'partner_ids': partner_ids,
-            'ancestor_id': False,
+            'parent_id': False,
             'vote_nb': len(message['vote_user_ids']),
             'has_voted': has_voted,
             'is_private': is_private,
@@ -273,12 +273,12 @@ class mail_message(osv.Model):
                 easily have access to their values, given their ID
             :return bool: True
         """
-        def _get_expandable(domain, message_nb, ancestor_id, id, model):
+        def _get_expandable(domain, message_nb, parent_id, id, model):
             return {
                 'domain': domain,
                 'nb_messages': message_nb,
                 'type': 'expandable',
-                'ancestor_id': ancestor_id,
+                'parent_id': parent_id,
                 'id':  id,
                 # TDE note: why do we need model sometimes, and sometimes not ???
                 'model': model,
@@ -286,6 +286,8 @@ class mail_message(osv.Model):
 
         # all_not_loaded_ids = []
         id_list = sorted(read_messages.keys())
+        if not id_list:
+            return message_list
 
         # 1. get the expandable for new threads
         if thread_level == 0:
@@ -402,11 +404,11 @@ class mail_message(osv.Model):
 
                 # get the older ancestor the user can read, update its ancestor field
                 if not thread_level:
-                    message_list[-1]['ancestor_id'] = parent_id
+                    message_list[-1]['parent_id'] = parent_id
                     continue
                 parent = self._get_parent(cr, uid, message, context=context)
                 while parent and parent.get('id') != parent_id:
-                    message_list[-1]['ancestor_id'] = parent.get('id')
+                    message_list[-1]['parent_id'] = parent.get('id')
                     message = parent
                     parent = self._get_parent(cr, uid, message, context=context)
                 # if in thread: add its ancestor to the list of messages

From 7cdf99ade180b00af9caa6094d624007d47a3dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 26 Oct 2012 11:58:21 +0200
Subject: [PATCH 084/106] [IMP] mail: improved display of openchatter in form
 views

bzr revid: fva@openerp.com-20121026095821-c3idarsd5yi9fzso
---
 addons/account/account_invoice_view.xml       |  4 +--
 .../account_voucher/account_voucher_view.xml  |  2 +-
 .../voucher_payment_receipt_view.xml          |  4 +--
 .../voucher_sales_purchase_view.xml           |  4 +--
 addons/analytic/analytic_view.xml             |  2 +-
 addons/base_calendar/crm_meeting_view.xml     |  2 +-
 addons/crm/crm_lead_view.xml                  |  4 +--
 addons/crm/crm_phonecall_view.xml             |  2 +-
 addons/crm/crm_view.xml                       |  2 +-
 addons/crm_claim/crm_claim_view.xml           |  2 +-
 addons/event/event_view.xml                   |  4 +--
 addons/hr/hr_view.xml                         |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   |  2 +-
 addons/hr_expense/hr_expense_view.xml         |  2 +-
 addons/hr_holidays/hr_holidays_view.xml       |  4 +--
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 addons/idea/idea_view.xml                     |  2 +-
 addons/mail/mail_group_view.xml               |  3 +-
 addons/mail/res_partner_view.xml              |  3 +-
 addons/mail/static/src/css/mail.css           | 16 ++++++++---
 addons/mail/static/src/js/mail_followers.js   | 28 +++++++++++--------
 addons/mail/static/src/xml/mail.xml           |  4 +--
 addons/mail/static/src/xml/mail_followers.xml |  6 ++--
 addons/mrp/mrp_view.xml                       |  4 +--
 addons/mrp_operations/mrp_operations_view.xml |  2 +-
 addons/mrp_repair/mrp_repair_view.xml         |  2 +-
 addons/procurement/procurement_view.xml       |  2 +-
 addons/product/product_view.xml               |  2 +-
 addons/project/project_view.xml               |  4 +--
 addons/project_issue/project_issue_view.xml   |  2 +-
 addons/purchase/purchase_view.xml             |  2 +-
 .../purchase_requisition_view.xml             |  2 +-
 addons/sale/sale_view.xml                     |  2 +-
 addons/stock/stock_view.xml                   |  4 +--
 34 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5ed373456f3..b08a5f1a410 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -279,8 +279,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -436,8 +436,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4b02d697982..babe60b640e 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -109,8 +109,8 @@
                     </notebook>
                   </sheet>
                   <div class="oe_chatter">
-                      <field name="message_ids" widget="mail_thread"/>
                       <field name="message_follower_ids" widget="mail_followers"/>
+                      <field name="message_ids" widget="mail_thread"/>
                   </div>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e1a48c6c535..6666ac77d2f 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -240,8 +240,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
@@ -512,8 +512,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index a362c553ccd..665ad4fb17f 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -147,8 +147,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
@@ -303,8 +303,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 0bb009e72b0..e769ea86f55 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -54,8 +54,8 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 9dd37afa3d6..26d1d409047 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -224,8 +224,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a0dce6a7ea9..b6890a7de07 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -223,8 +223,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
@@ -525,8 +525,8 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index b6e2f09de68..e721cf9f57f 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -150,8 +150,8 @@
                     <field name="description" placeholder="Description..."/>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index ba46cc023ab..5e2034d6373 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -132,8 +132,8 @@
                         </page>
                     </notebook>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers" help="Followers of this salesteam follow automatically all opportunities related to this salesteam."/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 0d9b5adef43..7d7d6459cba 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -179,8 +179,8 @@
                     </group>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 2b275898383..2227188ec1c 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -204,8 +204,8 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </div>
                 </form>
             </field>
@@ -486,8 +486,8 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index cab93c6c14a..4bf071337aa 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -359,8 +359,8 @@
                         </div>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 7164e7d9415..697ed6bacea 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -210,8 +210,8 @@
                     </group>
               </sheet>
 	          <div class="oe_chatter">
-	              <field name="message_ids" widget="mail_thread"/>
 	              <field name="message_follower_ids" widget="mail_followers"/>
+	              <field name="message_ids" widget="mail_thread"/>
 	          </div>
               </form>
             </field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 76393d9e030..e9f69a22184 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -139,8 +139,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1808e216906..7ccace1c536 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -121,8 +121,8 @@
                     </group>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </div>
                 </form>
             </field>
@@ -158,8 +158,8 @@
                     <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 12c552e7a6d..d67a543d683 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -183,8 +183,8 @@
                 <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
             <div class="oe_chatter">
-                <field name="message_ids" widget="mail_thread"/>
                 <field name="message_follower_ids" widget="mail_followers"/>
+                <field name="message_ids" widget="mail_thread"/>
             </div>
           </form>
         </field>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 5a1482830e1..5d9054bf4b7 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -79,8 +79,8 @@
                     <field name="description"/>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 6268cd425b1..2028e8d1b18 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -82,9 +82,8 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"
-                                options='{"thread_level": 1}'/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
                     </div>
                 </form>
             </field>
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 2a8430926d5..a4aa56ae971 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,9 +9,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread" 
-                            options='{"thread_level": 1}'/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index daa8594cba4..16d8a5ba24b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -4,9 +4,8 @@
     box-sizing: border-box;
 }
 .openerp .oe_mail {
-    display: inline-block;
+    display: block;
     position: relative;
-    width: 720px;
     margin: 0px;
 }
 .openerp .oe_mail .oe_thread{
@@ -257,7 +256,7 @@
     position: relative;
     display: inline-block;
     padding-top: 4px;
-    width: 120px;
+    width: 160px;
     float: right;
 }
 
@@ -302,6 +301,11 @@
 /*  b) THE FOLLOWERS */
 .openerp .oe_followers .oe_follower_title{
     margin-top: 4px;
+    margin-bottom: 4px;
+    display: inline;
+}
+.openerp .oe_followers .oe_invite{
+    float: right;
 }
 .openerp .oe_followers .oe_partner {
     height: 32px;
@@ -323,10 +327,14 @@
 
 /* ----------- FORM INTEGRATION ------------ */
 
-            /* Nothing to do yay! */
+.openerp .oe_record_thread{
+    display: block;
+    margin-right: 180px;
+}
 
 /* ----------- INBOX INTEGRATION ----------- */
 
 .openerp .oe_mail_wall .oe_mail{
     margin: 16px;
+    width: 720px;
 }
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index bf913df0b04..7fed5371600 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -25,7 +25,6 @@ openerp_mail_followers = function(session, mail) {
         init: function() {
             this._super.apply(this, arguments);
             this.image = this.node.attrs.image || 'image_small';
-            this.title = this.node.attrs.title || 'Followers';
             this.comment = this.node.attrs.help || false;
             this.displayed_nb = this.node.attrs.displayed_nb || 10;
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
@@ -115,20 +114,25 @@ openerp_mail_followers = function(session, mail) {
                 self.message_is_follower = (_.indexOf(self.get('value'), pid) != -1);
             }).pipe(self.proxy('display_generic'));
         },
-
+        _format_followers: function(count){
+            console.log('FORMAT FOLLWERS :',count);
+            function _t(str){return str;}
+            var str = '';
+            if(count <= 0){
+                str = _t('No followers');
+            }else if(count === 1){
+                str = _t('One follower');
+            }else{
+                str = ''+count+' '+_t('followers');
+            }
+            console.log('URGH:',str);
+            return str;
+        },
         /* Display generic info about follower, for people not having access to res_partner */
         display_generic: function () {
             var self = this;
             var node_user_list = this.$('.oe_follower_list').empty();
-            // format content: Followers (You and 0 other) // Followers (3)
-            var content = this.title;
-            if (this.message_is_follower) {
-                content += ' (You and ' + (this.get('value').length-1) + ' other)';
-            }
-            else {
-                content += ' (' + this.get('value').length + ')'
-            }
-            this.$('.oe_follower_title').html(content);
+            this.$('.oe_follower_title').html(this._format_followers(this.get('value').length));
         },
 
         /** Display the followers */
@@ -138,7 +142,7 @@ openerp_mail_followers = function(session, mail) {
             this.message_is_follower = this.set_is_follower(records);
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
-            this.$('.oe_follower_title').html(this.title + ' (' + records.length + ')');
+            this.$('.oe_follower_title').html(this._format_followers(records.length));
             // truncate number of displayed followers
             truncated = records.splice(0, this.displayed_nb);
             _(truncated).each(function (record) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ae8b622c978..ce3b0bed3b6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -179,10 +179,10 @@
         Template used to display the communication history in documents
         form view.
         -->
-    <span t-name="mail.record_thread" class="oe_record_thread">
+    <div t-name="mail.record_thread" class="oe_record_thread">
         <div class="oe_mail-placeholder">
         </div>
-    </span>
+    </div>
 
     <t t-name="mail.thread">
         <div t-attf-class="oe_thread #{widget.root?'oe_root_thread':''}"/>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 02796c5d80a..df4fd0c7fd9 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -17,10 +17,8 @@
         <t t-if="widget.comment">
             <h5 class="oe_comment"><t t-raw="widget.comment"/></h5>
         </t>
-        <button type="button" class="oe_invite"><span>Invite</span></button>
-        <t t-if="widget.title">
-            <h4 class='oe_follower_title'><t t-raw="widget.title"/></h4>
-        </t>
+        <h4 class='oe_follower_title'>Followers</h4>
+        <a href='#' class="oe_invite">Invite others</a>
         <div class="oe_follower_list"></div>
     </div>
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9d1ae9eae8a..57531c8b4bb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -409,8 +409,8 @@
                         </page>
                     </notebook>
                     <div class="oe_chatter">
-                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                          <field name="message_follower_ids" widget="mail_followers"/>
+                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </div>
                 </form>
             </field>
@@ -797,8 +797,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 834f3000472..13d02c8151c 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -107,8 +107,8 @@
                 </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 55cbe49c75b..2e8a1ae6ba9 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -189,8 +189,8 @@
                 </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 973a09477fc..42179b17f92 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -103,8 +103,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 74b2b868f7a..028e416984b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -166,8 +166,8 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0de5e1773b1..cc22a90e324 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -151,8 +151,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically follow all related tasks and issues."/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -466,8 +466,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 6ff5388ce4a..f03c48ed6df 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -159,8 +159,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1ec1cd452c9..a8d57799858 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -287,8 +287,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c4c2702d99c..5ee0a007cc9 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -102,8 +102,8 @@
                 </notebook>
             </sheet>
             <div class="oe_chatter">
-              <field name="message_ids" widget="mail_thread"/>
               <field name="message_follower_ids" widget="mail_followers"/>
+              <field name="message_ids" widget="mail_thread"/>
             </div> 
             </form>
         </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4d57dfcf9e0..df12d3671af 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -309,8 +309,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 806c723dc73..2883e765235 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -912,8 +912,8 @@
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
-                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                             <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         </div>
                     </xpath>
                 </data>
@@ -1038,8 +1038,8 @@
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
-                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                             <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         </div>
                     </xpath>
                 </data>

From 6031c0954b95e63ebf95d8515f18000fb9cd689e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 26 Oct 2012 11:59:34 +0200
Subject: [PATCH 085/106] [REM] mail_followers: removed WIP about email quote.

bzr revid: tde@openerp.com-20121026095934-4qumgad7dun75ct8
---
 addons/mail/mail_followers.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 5b024ee9b4d..07ccfeec9cc 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -142,18 +142,8 @@ class mail_notification(osv.Model):
         if not notify_partner_ids:
             return True
 
-        mail_mail = self.pool.get('mail.mail')
-
-        # TMP about thread formation
-        if msg.parent_id.id:
-            # 1. fetch all messages that will form the thread as SUPERUSER, filtering will be done after
-            messages = self.pool.get('mail.message').message_read(cr, SUPERUSER_ID, None, domain=['|', ('id', 'in', [msg.id, msg.parent_id.id]), ('parent_id', '=', msg.parent_id.id)], context=context, limit=5, thread_level=1)
-            for message in messages:
-                print message['body'], message['id'], message['parent_id']
-
-        # END TMP
-
         # add signature
+        mail_mail = self.pool.get('mail.mail')
         body_html = msg.body
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
         if signature:

From 0975d105e20f7572b4e7eadbb64719c3d4817d98 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 26 Oct 2012 12:58:35 +0200
Subject: [PATCH 086/106] [IMP] mail: one template for compose_message: compact
 & expend + replace by message

bzr revid: chm@openerp.com-20121026105835-i3gca74hku1z6y2x
---
 addons/mail/mail_thread.py          |   4 +-
 addons/mail/static/src/js/mail.js   | 258 +++++++++++++---------------
 addons/mail/static/src/xml/mail.xml |  17 +-
 3 files changed, 125 insertions(+), 154 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 685f9781cc9..59db6a18bc0 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -700,8 +700,8 @@ class mail_thread(osv.AbstractModel):
 
         if not subject and parent_id:
             parent = mail_message.read(cr, uid, parent_id, ['subject'], context=context)
-            if not parent['subject'].startswith('Re:')
-                subject = 'Re: ' + parent['subject']
+            if parent['subject'] and not parent['subject'].startswith('Re:'):
+                subject = 'Re: %s' % parent['subject']
 
         new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
                         subtype=subtype, parent_id=parent_id, context=context)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 78aa3e8513d..f98e82481fa 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -130,8 +130,7 @@ openerp.mail = function (session) {
     */
     
     mail.ThreadComposeMessage = session.web.Widget.extend({
-        template: 'mail.compose_message.compact',
-                    // expandable view : 'mail.compose_message'
+        template: 'mail.compose_message',
 
         /**
          * @param {Object} parent parent
@@ -147,7 +146,7 @@ openerp.mail = function (session) {
             this.context = options.context || {};
             this.options = options.options;
 
-            this.show_compact_message = this.options.show_compact_message || false;
+            this.show_compact_message = false;
 
             // data of this compose message
             this.attachment_ids = [];
@@ -165,19 +164,10 @@ openerp.mail = function (session) {
 
             this.fileupload_id = _.uniqueId('oe_fileupload_temp');
             $(window).on(self.fileupload_id, self.on_attachment_loaded);
-
-            this.$render_expandable = false;
-            this.$render_compact = false;
         },
 
         start: function () {
-            this.$render_compact = this.$el;
-
-            if ( this.options.show_compact_message ) {
-                this.$render_compact.show();
-            } else {
-                this.$render_compact.hide();
-            }
+            this.display_attachments();
             this.bind_events();
         },
 
@@ -187,14 +177,14 @@ openerp.mail = function (session) {
             var self = this;
             var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self}));
             if (!this.list_attachment) {
-                this.$render_expandable.find('.oe_msg_attachment_list').replaceWith( render );
+                this.$('.oe_msg_attachment_list').replaceWith( render );
             } else {
                 this.list_attachment.replaceWith( render );
             }
-            this.list_attachment = this.$render_expandable.find(".oe_msg_attachments");
+            this.list_attachment = this.$(".oe_msg_attachments");
 
             // event: delete an attachment
-            this.$render_expandable.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
+            this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
         },
 
         /* when a user click on the upload button, send file read on_attachment_loaded
@@ -222,9 +212,9 @@ openerp.mail = function (session) {
                 this.attachment_ids = attachments;
 
                 // submit file
-                this.$render_expandable.find('form.oe_form_binary_form').submit();
+                this.$('form.oe_form_binary_form').submit();
 
-                this.$render_expandable.find(".oe_attachment_file").hide();
+                this.$(".oe_attachment_file").hide();
 
                 this.attachment_ids.push({
                     'id': 0,
@@ -252,9 +242,9 @@ openerp.mail = function (session) {
             }
             this.display_attachments();
 
-            var $input = this.$render_expandable.find('input.oe_form_binary_file');
+            var $input = this.$('input.oe_form_binary_file');
             $input.after($input.clone(true)).remove();
-            this.$render_expandable.find(".oe_attachment_file").show();
+            this.$(".oe_attachment_file").show();
         },
 
         /* unlink the file on the server and reload display
@@ -280,24 +270,22 @@ openerp.mail = function (session) {
         bind_events: function () {
             var self = this;
 
-            this.$render_compact.find('textarea').unbind().on('focus', self.on_compose_expandable);
+            this.$('textarea.oe_compact').on('focus', self.on_compose_expandable);
 
-            if (this.$render_expandable) {
-                // set the function called when attachments are added
-                this.$render_expandable.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
+            // set the function called when attachments are added
+            this.$el.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
 
-                this.$render_expandable.on('click', '.oe_cancel', self.on_cancel );
-                this.$render_expandable.on('click', '.oe_post', function () {self.on_message_post()} );
-                this.$render_expandable.on('click', '.oe_full', function () {self.on_compose_fullmail('reply')} );
+            this.$el.on('click', '.oe_cancel', self.on_cancel );
+            this.$el.on('click', '.oe_post', function () {self.on_message_post()} );
+            this.$el.on('click', '.oe_full', function () {self.on_compose_fullmail('reply')} );
 
-                // auto close
-                this.$render_expandable.on('blur', 'textarea', this.on_compose_expandable);
+            /* stack for don't close the compose form if the user click on a button */
+            this.$el.on('mousedown', 'div', function () { self.stay_open = true; });
+            this.$('textarea:not(.oe_compact):first').on('focus, mouseup, keydown', function () { self.stay_open = false; });
+            this.$('textarea:not(.oe_compact):first').autosize();
 
-                /* stack for don't close the compose form if the user click on a button */
-                this.$render_expandable.on('focus, mouseup', 'textarea', function () { self.stay_open = false; });
-                this.$render_expandable.on('mousedown', function () { self.stay_open = true; });
-                this.$render_expandable.find('textarea').autosize();
-            }
+            // auto close
+            this.$el.on('blur', 'textarea:not(.oe_compact):first', self.on_compose_expandable);
         },
 
         on_compose_fullmail: function (default_composition_mode) {
@@ -314,7 +302,7 @@ openerp.mail = function (session) {
                 var context = {
                     'default_composition_mode': 'reply',
                     'default_parent_id': this.id,
-                    'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
+                    'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
                     'default_attachment_ids': this.attachment_ids,
                     'default_partner_ids': [], //partner_ids
                 };
@@ -326,7 +314,7 @@ openerp.mail = function (session) {
                     'default_content_subtype': 'html',
                     'default_composition_mode': 'comment',
                     'default_parent_id': this.id,
-                    'default_body': mail.ChatterUtils.get_text2html(this.$render_expandable ? (this.$render_expandable.find('textarea').val() || '') : ''),
+                    'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
                     'default_attachment_ids': this.attachment_ids,
                     'default_partner_ids': [], //partner_ids
                 };
@@ -343,22 +331,26 @@ openerp.mail = function (session) {
             };
 
             this.do_action(action);
+            this.on_cancel();
+        },
 
-            if (this.$render_expandable) {
-                this.on_cancel();
-            }
+        reinit: function() {
+            var $render = $( session.web.qweb.render('mail.compose_message', {'widget': this}) );
+
+            $render.insertAfter(this.$el.last());
+            this.$el.remove();
+            this.$el = $render;
+
+            this.display_attachments();
+            this.bind_events();
         },
 
         on_cancel: function (event) {
             if (event) event.stopPropagation();
-            this.$render_expandable.find('textarea').val("");
-            this.$render_expandable.find('input[data-id]').remove();
-
             this.attachment_ids=[];
-            this.display_attachments();
-
             this.stay_open = false;
-            this.on_compose_expandable();
+            this.show_composer = false;
+            this.reinit();
         },
 
         /*post a message and fetch the message*/
@@ -366,7 +358,7 @@ openerp.mail = function (session) {
             var self = this;
 
             if (! body) {
-                var comment_node =  this.$render_expandable.find('textarea');
+                var comment_node =  this.$('textarea:not(.oe_compact)');
                 var body = comment_node.val();
                 comment_node.val('');
             }
@@ -396,70 +388,44 @@ openerp.mail = function (session) {
                         // create object and attach to the thread object
                         var message = thread.create_message_object( record[0] );
                         // insert the message on dom
-                        thread.insert_message( message, self.thread_level > self.options.display_indented_thread ? self.parent_thread.$el : self.$el );
-                        // clean compose message
-                        self.on_cancel();
+                        thread.insert_message( message, self.$el );
+                        if (thread.parent_thread) {
+                            self.$el.remove();
+                            self.parent_thread.compose_message = null;
+                        } else {
+                            self.on_cancel();
+                        }
                         //session.web.unblockUI();
                     });
                 return true;
             }
         },
 
-        /* create the compose on expandable form
-        */
-        instantiate_expandable: function () {
-            if (!this.$render_expandable) {
-                this.$render_expandable = $(session.web.qweb.render('mail.compose_message', {'widget': this}));
-                this.$render_expandable.hide();
-
-                this.$render_expandable.insertAfter( this.$render_compact );
-                this.display_attachments();
-
-                this.bind_events();
-            }
-        },
-
         /* convert the compact mode into the compose message
         */
         on_compose_expandable: function (event) {
             if (event) event.stopPropagation();
 
-            var self = this;
-
-            this.instantiate_expandable();
-
-            if (this.$render_expandable.is(':hidden')) {
-
-                this.$render_expandable.css('display', '');
-                this.$render_compact.hide();
-                this.$render_expandable.find('textarea').focus();
-
-            } else if (!this.stay_open) {
-
-                // do not close the box if there are some text
-                if (!this.$render_expandable.find('textarea').val().match(/\S+/)) {
-                    this.$render_expandable.hide();
-                    if (this.options.show_compact_message && this.show_compact_message) {
-                        this.$render_compact.css('display', '');
-                    } else {
-                        this.$render_compact.hide();
-                    }
-                }
-
+            if (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/)){
+                this.show_composer = !this.show_composer || this.stay_open;
+                this.reinit();
             }
+            this.$('textarea:not(.oe_compact):first').focus();
             return true;
         },
 
         do_hide_compact: function () {
-            this.$render_compact.hide();
             this.show_compact_message = false;
+            if (!this.show_composer) {
+                this.reinit();
+            }
         },
 
         do_show_compact: function () {
-            if (this.options.show_compact_message && (!this.$render_expandable || this.$render_expandable.is(':hidden'))) {
-                this.$render_compact.css('display', '');
-            }
             this.show_compact_message = true;
+            if (!this.show_composer) {
+                this.reinit();
+            }
         }
     });
 
@@ -520,10 +486,10 @@ openerp.mail = function (session) {
             this.$el.on('click', 'a.oe_msg_fetch_more', this.on_expandable);
         },
 
-        animated_destroy: function (options) {
+        animated_destroy: function (fadeTime) {
             var self=this;
             //graphic effects
-            if (options && options.fadeTime) {
+            if (fadeTime) {
                 self.$el.fadeOut(options.fadeTime, function () {
                     self.destroy();
                 });
@@ -542,7 +508,7 @@ openerp.mail = function (session) {
             }
             this.flag_used = true;
 
-            this.animated_destroy({'fadeTime':300});
+            this.animated_destroy(300);
             this.parent_thread.message_fetch(this.domain, this.context);
             return false;
         },
@@ -770,10 +736,10 @@ openerp.mail = function (session) {
          * Fade out the message and his child thread.
          * Then this object is destroyed.
          */
-        animated_destroy: function (options) {
+        animated_destroy: function (fadeTime) {
             var self=this;
             //graphic effects  
-            if (options && options.fadeTime) {
+            if (fadeTime) {
                 self.$el.fadeOut(options.fadeTime, function () {
                     self.parent_thread.message_to_expandable(self);
                 });
@@ -791,7 +757,7 @@ openerp.mail = function (session) {
             event.stopPropagation();
             if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
             
-            this.animated_destroy({fadeTime:250});
+            this.animated_destroy(250);
             // delete this message and his childs
             var ids = [this.id].concat( this.get_child_ids() );
             this.ds_message.unlink(ids);
@@ -807,7 +773,7 @@ openerp.mail = function (session) {
 
             if ( (this.to_read && this.options.typeof_thread == 'inbox') ||
                 (!this.to_read && this.options.typeof_thread == 'archives')) {
-                this.animated_destroy({fadeTime:250});
+                this.animated_destroy(250);
             }
 
             // if this message is read, all childs message display is read
@@ -900,7 +866,7 @@ openerp.mail = function (session) {
                 } else {
                     button.removeClass('oe_starred');
                     if ( self.options.typeof_thread == 'stared' ) {
-                        self.animated_destroy({fadeTime:250});
+                        self.animated_destroy(250);
                     }
                 }
             });
@@ -979,7 +945,7 @@ openerp.mail = function (session) {
             this.show_compose_message = this.options.show_compose_message && (this.options.show_reply_button > this.thread_level || !this.thread_level);
 
             // object compose message
-            this.ComposeMessage = false;
+            this.compose_message = false;
 
             this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model || 'mail.thread');
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
@@ -987,29 +953,33 @@ openerp.mail = function (session) {
         
         start: function () {
             this._super.apply(this, arguments);
+
             if (this.show_compose_message) {
-                this.instantiate_ComposeMessage();
+                this.instantiate_compose_message();
             }
+
             this.bind_events();
         },
 
         /* instantiate the compose message object and insert this on the DOM.
         * The compose message is display in compact form.
         */
-        instantiate_ComposeMessage: function () {
+        instantiate_compose_message: function () {
             // add message composition form view
-            this.ComposeMessage = new mail.ThreadComposeMessage(this, this, {
-                'context': this.context,
-                'options': this.options,
-            });
-
-            if (this.thread_level) {
-                this.ComposeMessage.appendTo(this.$el);
-            } else {
-                // root view
-                this.ComposeMessage.prependTo(this.$el);
+            if (!this.compose_message) {
+                this.compose_message = new mail.ThreadComposeMessage(this, this, {
+                    'context': this.context,
+                    'options': this.options,
+                });
+                if (!this.thread_level) {
+                    // root view
+                    this.compose_message.insertBefore(this.$el);
+                } else if (this.thread_level > this.options.display_indented_thread) {
+                    this.compose_message.insertAfter(this.$el);
+                } else {
+                    this.compose_message.appendTo(this.$el);
+                }
             }
-            this.ComposeMessage.do_hide_compact();
         },
 
         /* When the expandable object is visible on screen (with scrolling)
@@ -1139,24 +1109,24 @@ openerp.mail = function (session) {
         },
 
         /**
-         *If ComposeMessage doesn't exist, instantiate the compose message.
+         *If compose_message doesn't exist, instantiate the compose message.
         * Call the on_compose_expandable method to allow the user to write his message.
         * (Is call when a user click on "Reply" button)
         */
         on_compose_message: function () {
-            if (!this.ComposeMessage) {
-                this.instantiate_ComposeMessage();
-                this.ComposeMessage.do_hide_compact();
-            }
-
-            this.ComposeMessage.on_compose_expandable();
+            this.instantiate_compose_message();
+            this.compose_message.on_compose_expandable();
         },
 
         /**
          *display the message "there are no message" on the thread
         */
         no_message: function () {
-            $(session.web.qweb.render('mail.wall_no_message', {})).appendTo(this.$el);
+            var no_message = $(session.web.qweb.render('mail.wall_no_message', {}));
+            if (this.options.no_message) {
+                no_message.html(this.options.no_message);
+            }
+            no_message.appendTo(this.$el);
         },
 
         /**
@@ -1231,8 +1201,9 @@ openerp.mail = function (session) {
         insert_message: function (message, dom_insert_after) {
             var self=this;
 
-            if (this.show_compose_message) {
-                this.ComposeMessage.do_show_compact();
+            if (this.show_compose_message && this.options.show_compact_message) {
+                this.instantiate_compose_message();
+                this.compose_message.do_show_compact();
             }
 
             this.$('.oe_wall_no_message').remove();
@@ -1244,17 +1215,17 @@ openerp.mail = function (session) {
             } 
 
             // check older and newer message for insertion
-            var parent_newer = false;
-            var parent_older = false;
+            var message_newer = false;
+            var message_older = false;
             if (message.id > 0) {
                 for (var i in self.messages) {
                     if (self.messages[i].id > message.id) {
-                        if (!parent_newer || parent_newer.id > self.messages[i].id) {
-                            parent_newer = self.messages[i];
+                        if (!message_newer || message_newer.id > self.messages[i].id) {
+                            message_newer = self.messages[i];
                         }
                     } else if (self.messages[i].id > 0 && self.messages[i].id < message.id) {
-                        if (!parent_older || parent_older.id < self.messages[i].id) {
-                            parent_older = self.messages[i];
+                        if (!message_older || message_older.id < self.messages[i].id) {
+                            message_older = self.messages[i];
                         }
                     }
                 }
@@ -1264,14 +1235,13 @@ openerp.mail = function (session) {
 
 
             if (sort) {
-                if (parent_older) {
+                if (message_older) {
 
-                    //warning : insert after the thread of the message !
-                    message.insertAfter(parent_older.thread ? parent_older.thread.$el : parent_older.$el);
+                    message.insertAfter(message_older.thread.compose_message ? message_older.thread.compose_message.$el : message_older.thread.$el);
 
-                } else if (parent_newer) {
+                } else if (message_newer) {
 
-                    message.insertBefore(parent_newer.$el);
+                    message.insertBefore(message_newer.$el);
 
                 } else if (message.id < 0) {
 
@@ -1282,14 +1252,13 @@ openerp.mail = function (session) {
                     message.prependTo(self.$el);
                 }
             } else {
-                if (parent_older) {
+                if (message_older) {
 
-                    message.insertBefore(parent_older.$el);
+                    message.insertBefore(message_older.$el);
 
-                } else if (parent_newer) {
+                } else if (message_newer) {
 
-                    //warning : insert after the thread of the message !
-                    message.insertAfter(parent_newer.thread ? parent_newer.thread.$el : parent_newer.$el);
+                    message.insertAfter(message_newer.thread.compose_message ? message_newer.thread.compose_message.$el : message_newer.thread.$el);
 
                 } else if (message.id < 0) {
 
@@ -1436,7 +1405,7 @@ openerp.mail = function (session) {
          * @param {Array} [domain]
          * @param {Object} [context] context of the thread. It should
          *   contain at least default_model, default_res_id. Please refer to
-         *   the ComposeMessage widget for more information about it.
+         *   the compose_message widget for more information about it.
          * ... @param {Select} [typeof_thread=(mail|stared|archives|send|other)]
          *       options for destroy message when the user click on a button
          * @param {Object} [options]
@@ -1453,6 +1422,7 @@ openerp.mail = function (session) {
          *      when the user clic on this compact mode, the composer is open
          *...  @param {Array} [message_ids] List of ids to fetch by the root thread.
          *      When you use this option, the domain is not used for the fetch root.
+         *     @param {String} [no_message] Message to display when there are no message
          */
         init: function (parent, options) {
             this._super(parent);
@@ -1469,7 +1439,8 @@ openerp.mail = function (session) {
                 'show_record_name' : false,
                 'show_compose_message' : false,
                 'show_compact_message' : false,
-                'message_ids': []
+                'message_ids': [],
+                'no_message': false
             }, options);
 
             if (this.display_indented_thread === false) {
@@ -1509,10 +1480,11 @@ openerp.mail = function (session) {
             this.thread.message_fetch(null, null, this.options.message_ids);
 
             if (this.options.show_compose_message) {
+                this.thread.instantiate_compose_message();
                 if (this.options.show_compact_message) {
-                    this.thread.ComposeMessage.do_show_compact();
+                    this.thread.compose_message.do_show_compact();
                 } else {
-                    this.thread.ComposeMessage.do_hide_compact();
+                    this.thread.compose_message.do_hide_compact();
                 }
             }
         },
@@ -1535,6 +1507,7 @@ openerp.mail = function (session) {
      * This widget handles the display of messages on a document. Its main
      * use is to receive a context and a domain, and to delegate the message
      * fetching and displaying to the Thread widget.
+     * Use Help on the field to display a custom "no message loaded"
      */
     session.web.form.widgets.add('mail_thread', 'openerp.mail.RecordThread');
     mail.RecordThread = session.web.form.AbstractField.extend({
@@ -1589,6 +1562,7 @@ openerp.mail = function (session) {
                 'show_compose_message': show_compose_message,
                 'message_ids': message_ids,
                 'show_compact_message': true,
+                'no_message': this.node.attrs.help
                 }
             );
 
@@ -1693,7 +1667,7 @@ openerp.mail = function (session) {
 
         bind_events: function () {
             var self=this;
-            this.$(".oe_write_full").click(function(){ self.root.thread.ComposeMessage.on_compose_fullmail(); });
+            this.$(".oe_write_full").click(function(){ self.root.thread.compose_message.on_compose_fullmail(); });
             this.$(".oe_write_onwall").click(function(){ self.root.thread.on_compose_message(); });
         }
     });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ae8b622c978..cbd2b263b87 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -13,9 +13,13 @@
         an e-mail. It contains by default a textarea, that will be replaced
         by another composition form in the main wall composition form, or
         for main thread composition form in document form view.
+
+        mail.compose_message.compact template
+        This template holds the composition form to write a message, this box is converted into
+        mail.compose_message when focus on textarea
         -->
     <t t-name="mail.compose_message">
-        <div t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+        <div t-if="widget.show_composer" t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <div class="oe_msg_left">
                 <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
@@ -33,17 +37,10 @@
                 </div>
             </div>
         </div>
-    </t>
-
-    <!--
-        mail.compose_message.compact template
-        This template holds the composition form to write a message, this box is converted into
-        mail.compose_message when focus on textarea
-        -->
-    <t t-name="mail.compose_message.compact">
-        <div t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+        <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
+        <span t-if="!widget.show_compact_message and !widget.show_composer" class="oe_placeholder_self"></span>
     </t>
 
     <!--

From daeccb5ab2e98b9f9a12a4ccf10626a81a2afab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 26 Oct 2012 13:33:36 +0200
Subject: [PATCH 087/106] [IMP] mail: added a quote context to email
 notifications. This is a first basic implementation with a dummy template
 that will have to be improved. Updated tests. TOFIX: some of the tests will
 have to be cleaned a bit.

bzr revid: tde@openerp.com-20121026113336-s18129kmn2df4lhs
---
 addons/mail/mail_followers.py  |  5 ++
 addons/mail/mail_message.py    | 94 ++++++++++++++++++++++++++++++----
 addons/mail/tests/test_mail.py | 39 ++++++++++----
 3 files changed, 119 insertions(+), 19 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 07ccfeec9cc..2d9661871cc 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -142,9 +142,14 @@ class mail_notification(osv.Model):
         if not notify_partner_ids:
             return True
 
+        # add the context in the email
+        quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
+
         # add signature
         mail_mail = self.pool.get('mail.mail')
         body_html = msg.body
+        if quote_context:
+            body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
         if signature:
             body_html = tools.append_content_to_html(body_html, signature)
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 2e46162c3f6..3d8dee9a4b2 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -24,11 +24,17 @@ import tools
 
 from email.header import decode_header
 from openerp import SUPERUSER_ID
-from osv import osv, orm, fields
-from tools.translate import _
+from openerp.osv import osv, orm, fields
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
+try:
+    from mako.template import Template as MakoTemplate
+except ImportError:
+    _logger.warning("payment_acquirer: mako templates not available, payment acquirer will not work!")
+
+
 """ Some tools for parsing / creating email fields """
 def decode(text):
     """Returns unicode() string conversion of the the given encoded smtp header text"""
@@ -618,10 +624,87 @@ class mail_message(osv.Model):
             self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
         return super(mail_message, self).unlink(cr, uid, ids, context=context)
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        """ Overridden to avoid duplicating fields that are unique to each email """
+        if default is None:
+            default = {}
+        default.update(message_id=False, headers=False)
+        return super(mail_message, self).copy(cr, uid, id, default=default, context=context)
+
     #------------------------------------------------------
     # Messaging API
     #------------------------------------------------------
 
+    MAIL_TEMPLATE = """<div>
+    % if message:
+        ${display_message(message)}
+    % endif
+    % for ctx_msg in context_messages:
+        ${display_message(ctx_msg)}
+    % endfor
+    % if add_expandable:
+        ${display_expandable()}
+    % endif
+    ${display_message(header_message)}
+    </div>
+
+    <%def name="display_message(message)">
+        <div>
+            Subject: ${message.subject}<br />
+            Body: ${message.body}
+        </div>
+    </%def>
+
+    <%def name="display_expandable()">
+        <div>This is an expandable.</div>
+    </%def>
+    """
+
+    def message_quote_context(self, cr, uid, id, context=None, limit=3, add_original=False):
+        """
+            1. message.parent_id = False: new thread, no quote_context
+            2. get the lasts messages in the thread before message
+            3. get the message header
+            4. add an expandable between them
+
+            :param dict quote_context: options for quoting
+            :return string: html quote
+        """
+        add_expandable = False
+
+        message = self.browse(cr, uid, id, context=context)
+        if not message.parent_id:
+            return ''
+        context_ids = self.search(cr, uid, [
+            ('parent_id', '=', message.parent_id.id),
+            ('id', '<', message.id),
+            ], limit=limit, context=context)
+
+        if len(context_ids) >= limit:
+            add_expandable = True
+            context_ids = context_ids[0:-1]
+
+        context_ids.append(message.parent_id.id)
+        context_messages = self.browse(cr, uid, context_ids, context=context)
+        header_message = context_messages.pop()
+
+        try:
+            if not add_original:
+                message = False
+            result = MakoTemplate(self.MAIL_TEMPLATE).render_unicode(message=message,
+                                                        context_messages=context_messages,
+                                                        header_message=header_message,
+                                                        add_expandable=add_expandable,
+                                                        # context kw would clash with mako internals
+                                                        ctx=context,
+                                                        format_exceptions=True)
+            result = result.strip()
+            return result
+        except Exception:
+            _logger.exception("failed to render mako template for quoting message")
+            return ''
+        return result
+
     def _notify(self, cr, uid, newid, context=None):
         """ Add the related record followers to the destination partner_ids if is not a private message.
             Call mail_notification.notify to manage the email sending
@@ -656,13 +739,6 @@ class mail_message(osv.Model):
 
         self.pool.get('mail.notification')._notify(cr, uid, newid, context=context)
 
-    def copy(self, cr, uid, id, default=None, context=None):
-        """ Overridden to avoid duplicating fields that are unique to each email """
-        if default is None:
-            default = {}
-        default.update(message_id=False, headers=False)
-        return super(mail_message, self).copy(cr, uid, id, default=default, context=context)
-
     #------------------------------------------------------
     # Tools
     #------------------------------------------------------
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index a1e53c4ec68..9af913c55ff 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -339,7 +339,25 @@ class test_mail(TestMailMockups):
         self.assertTrue(subtype_data['mt_mg_nodef']['followed'], 'Admin should follow mt_mg_nodef in pigs')
         self.assertTrue(subtype_data['mt_all_nodef']['followed'], 'Admin should follow mt_all_nodef in pigs')
 
-    def test_20_message_post(self):
+    def test_20_message_quote_context(self):
+        """ Tests designed for message_post. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+
+        msg1_id = self.mail_message.create(cr, uid, {'body': 'Thread header about Zap Brannigan', 'subject': 'My subject'})
+        msg2_id = self.mail_message.create(cr, uid, {'body': 'First answer, should not be displayed', 'subject': 'Re: My subject', 'parent_id': msg1_id})
+        msg3_id = self.mail_message.create(cr, uid, {'body': 'Second answer', 'subject': 'Re: My subject', 'parent_id': msg1_id})
+        msg4_id = self.mail_message.create(cr, uid, {'body': 'Third answer', 'subject': 'Re: My subject', 'parent_id': msg1_id})
+        msg_new_id = self.mail_message.create(cr, uid, {'body': 'My answer I am propagating', 'subject': 'Re: My subject', 'parent_id': msg1_id})
+
+        result = self.mail_message.message_quote_context(cr, uid, msg_new_id, limit=3)
+        self.assertIn('Thread header about Zap Brannigan', result, 'Thread header content should be in quote.')
+        self.assertIn('Second answer', result, 'Answer should be in quote.')
+        self.assertIn('Third answer', result, 'Answer should be in quote.')
+        self.assertIn('expandable', result, 'Expandable should be present.')
+        self.assertNotIn('First answer, should not be displayed', result, 'Old answer should not be in quote.')
+        self.assertNotIn('My answer I am propagating', result, 'Thread header content should be in quote.')
+
+    def test_21_message_post(self):
         """ Tests designed for message_post. """
         cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
         self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
@@ -416,8 +434,9 @@ class test_mail(TestMailMockups):
         self.assertEqual(len(sent_emails), 2, 'sent_email number of sent emails incorrect')
         for sent_email in sent_emails:
             self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
-            self.assertIn(_mail_body2, sent_email['body'], 'sent_email body incorrect')
-            self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect')
+            # TDE FIXME: fix those tests, difficult to handle with fixed strings
+            # self.assertIn(_mail_body2, sent_email['body'], 'sent_email body incorrect')
+            # self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect')
         # Test: mail_message: notified_partner_ids = group followers
         message_pids = set([partner.id for partner in message.notified_partner_ids])
         test_pids = set([p_b_id, p_c_id, p_d_id])
@@ -611,7 +630,7 @@ class test_mail(TestMailMockups):
         # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
         self.assertEqual(len(read_msg_list), 4, 'message_read on last Pigs message should return 2 messages and 2 expandables')
         self.assertEqual(set([msg_id2, msg_id10]), set(read_msg_ids), 'message_read on the last Pigs message should also get its parent')
-        self.assertEqual(read_msg_list[1].get('ancestor_id'), read_msg_list[0].get('id'), 'message_read should set the ancestor to the thread header')
+        self.assertEqual(read_msg_list[1].get('parent_id'), read_msg_list[0].get('id'), 'message_read should set the ancestor to the thread header')
         # Data: get expandables
         new_threads_exp, new_msg_exp = None, None
         for msg in read_msg_list:
@@ -629,7 +648,7 @@ class test_mail(TestMailMockups):
         self.assertIn(('id', 'child_of', msg_id2), domain, 'new messages expandable domain should contain a child_of condition')
         self.assertIn(('id', '>=', msg_id4), domain, 'new messages expandable domain should contain an id greater than condition')
         self.assertIn(('id', '<=', msg_id8), domain, 'new messages expandable domain should contain an id less than condition')
-        self.assertEqual(new_msg_exp.get('ancestor_id'), msg_id2, 'new messages expandable should have ancestor_id set to the thread header')
+        self.assertEqual(new_msg_exp.get('parent_id'), msg_id2, 'new messages expandable should have ancestor_id set to the thread header')
         # Do: message_read with domain, thread_level=0, parent_id=msg_id2 (should be imposed by JS)
         read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=200, thread_level=0, parent_id=msg_id2)
         for msg in read_msg_list:
@@ -645,14 +664,14 @@ class test_mail(TestMailMockups):
         _print_debug('Executing %s' % domain, _debug)
         for condition in pigs_domain:
             self.assertIn(condition, domain, 'new threads expandable domain should contain the message_read domain parameter')
-        self.assertFalse(new_threads_exp.get('ancestor_id'), 'new threads expandable should not have an ancestor_id')
+        self.assertFalse(new_threads_exp.get('parent_id'), 'new threads expandable should not have an ancestor_id')
         # Do: message_read with domain, thread_level=1 (should be imposed by JS)
         read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=1, thread_level=1)
         read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
         # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
         self.assertEqual(len(read_msg_list), 4, 'message_read on Pigs should return 2 messages and 2 expandables')
         self.assertEqual(set([msg_id1, msg_id9]), set(read_msg_ids), 'message_read on a Pigs message should also get its parent')
-        self.assertEqual(read_msg_list[1].get('ancestor_id'), read_msg_list[0].get('id'), 'message_read should set the ancestor to the thread header')
+        self.assertEqual(read_msg_list[1].get('parent_id'), read_msg_list[0].get('id'), 'message_read should set the ancestor to the thread header')
         # Data: get expandables
         new_threads_exp, new_msg_exp = None, None
         for msg in read_msg_list:
@@ -670,7 +689,7 @@ class test_mail(TestMailMockups):
         self.assertIn(('id', 'child_of', msg_id1), domain, 'new messages expandable domain should contain a child_of condition')
         self.assertIn(('id', '>=', msg_id3), domain, 'new messages expandable domain should contain an id greater than condition')
         self.assertIn(('id', '<=', msg_id7), domain, 'new messages expandable domain should contain an id less than condition')
-        self.assertEqual(new_msg_exp.get('ancestor_id'), msg_id1, 'new messages expandable should have ancestor_id set to the thread header')
+        self.assertEqual(new_msg_exp.get('parent_id'), msg_id1, 'new messages expandable should have ancestor_id set to the thread header')
         # Do: message_read with domain, thread_level=0, parent_id=msg_id1 (should be imposed by JS)
         read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=200, thread_level=0, parent_id=msg_id1)
         for msg in read_msg_list:
@@ -706,8 +725,8 @@ class test_mail(TestMailMockups):
         # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is not set, 1 expandable
         self.assertEqual(len(read_msg_list), 3, 'message_read on last Pigs message should return 2 messages and 1 expandable')
         self.assertEqual(set([msg_id9, msg_id10]), set(read_msg_ids), 'message_read flat on Pigs last messages should only return those messages')
-        self.assertFalse(read_msg_list[0].get('ancestor_id'), 'message_read flat should set the ancestor as False')
-        self.assertFalse(read_msg_list[1].get('ancestor_id'), 'message_read flat should set the ancestor as False')
+        self.assertFalse(read_msg_list[0].get('parent_id'), 'message_read flat should set the ancestor as False')
+        self.assertFalse(read_msg_list[1].get('parent_id'), 'message_read flat should set the ancestor as False')
         # Data: get expandables
         new_threads_exp, new_msg_exp = None, None
         for msg in read_msg_list:

From dd5961816c09efafad2430274c32b0bbc20a56fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 26 Oct 2012 13:41:14 +0200
Subject: [PATCH 088/106] [REV] Reverted use of quote_context in mail
 formation. Methods are still there, but will be improved in a future branch.

bzr revid: tde@openerp.com-20121026114114-4uar0usx7jzhl6rv
---
 addons/mail/mail_followers.py  | 7 ++++---
 addons/mail/tests/test_mail.py | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 2d9661871cc..a7d80935939 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -143,13 +143,14 @@ class mail_notification(osv.Model):
             return True
 
         # add the context in the email
-        quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
+        # TDE FIXME: comment, to be improved in a future branch
+        # quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
 
         # add signature
         mail_mail = self.pool.get('mail.mail')
         body_html = msg.body
-        if quote_context:
-            body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
+        # if quote_context:
+        #     body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
         if signature:
             body_html = tools.append_content_to_html(body_html, signature)
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 9af913c55ff..f7978a3240e 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -434,9 +434,8 @@ class test_mail(TestMailMockups):
         self.assertEqual(len(sent_emails), 2, 'sent_email number of sent emails incorrect')
         for sent_email in sent_emails:
             self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
-            # TDE FIXME: fix those tests, difficult to handle with fixed strings
-            # self.assertIn(_mail_body2, sent_email['body'], 'sent_email body incorrect')
-            # self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect')
+            self.assertIn(_mail_body2, sent_email['body'], 'sent_email body incorrect')
+            self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect')
         # Test: mail_message: notified_partner_ids = group followers
         message_pids = set([partner.id for partner in message.notified_partner_ids])
         test_pids = set([p_b_id, p_c_id, p_d_id])

From 9014be7ca4058ffa112ac33e6c4af7d00fba64a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 26 Oct 2012 14:36:04 +0200
Subject: [PATCH 089/106] [CLEAN] mail: cleaned code before merging, removed
 debug and print statements.

bzr revid: tde@openerp.com-20121026123604-l4j4e1ta26hw6fur
---
 addons/mail/mail_followers.py  |  4 ++--
 addons/mail/mail_message.py    |  5 ----
 addons/mail/mail_thread.py     |  5 +++-
 addons/mail/tests/test_mail.py | 43 ----------------------------------
 4 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index a7d80935939..416afa219d6 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -143,11 +143,11 @@ class mail_notification(osv.Model):
             return True
 
         # add the context in the email
-        # TDE FIXME: comment, to be improved in a future branch
+        # TDE FIXME: commented, to be improved in a future branch
         # quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
 
-        # add signature
         mail_mail = self.pool.get('mail.mail')
+        # add signature
         body_html = msg.body
         # if quote_context:
         #     body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 3d8dee9a4b2..4a6a4a9d16d 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -229,8 +229,6 @@ class mail_message(osv.Model):
         except (orm.except_orm, osv.except_osv):
             attachment_ids = []
 
-        # TDE note: should we send partner_ids ?
-        # TDE note: shouldn't we separated followers and other partners ? costly to compute maybe ,
         try:
             partner_ids = self.pool.get('res.partner').name_get(cr, uid, message['partner_ids'], context=context)
         except (orm.except_orm, osv.except_osv):
@@ -396,7 +394,6 @@ class mail_message(osv.Model):
         read_messages = {}
         message_list = []
 
-        # TDE FIXME: check access rights on search are implemented for mail.message
         # no specific IDS given: fetch messages according to the domain, add their parents if uid has access to
         if ids is None:
             ids = self.search(cr, uid, domain, context=context, limit=limit)
@@ -484,11 +481,9 @@ class mail_message(osv.Model):
                 partner_ids.add(message.get('id'))
             elif message.get('model') and message.get('res_id'):
                 model_ids.setdefault(message.get('model'), {}).setdefault(message.get('res_id'), set()).add(message.get('id'))
-        # print '_search', ids, author_ids, partner_ids, model_ids
 
         model_access_obj = self.pool.get('ir.model.access')
         for doc_model, doc_dict in model_ids.iteritems():
-            # print '>>>>', doc_model, doc_dict
             if not model_access_obj.check(cr, uid, doc_model, 'read', False):
                 continue
             doc_ids = doc_dict.keys()
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7ce3eb3afd8..da356d6a015 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -679,10 +679,13 @@ class mail_thread(osv.AbstractModel):
         # we want to set a parent: force to set the parent_id to the oldest ancestor, to avoid having more than 1 level of thread
         elif parent_id:
             message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
+            # avoid loops when finding ancestors
+            processed_list = []
             if message_ids:
                 _counter, _counter_max = 0, 200
                 message = mail_message.browse(cr, SUPERUSER_ID, message_ids[0], context=context)
-                while (message.parent_id and (_counter <= _counter_max)):
+                while (message.parent_id and message.parent_id.id not in processed_list):
+                    processed_list.append(message.parent_id.id)
                     message = message.parent_id
                 parent_id = message.id
 
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index f7978a3240e..ea0db38fd26 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -573,20 +573,6 @@ class test_mail(TestMailMockups):
 
     def test_30_message_read(self):
         """ Tests for message_read and expandables. """
-
-        def _print_debug(message, debug=True, prefix=''):
-            if debug:
-                print prefix, message
-
-        def _print_msg(message, debug=True, prefix=''):
-            if not debug:
-                return
-            if message.get('type') == 'expandable':
-                print prefix, 'expandable', message
-            else:
-                print prefix, 'message', message.get('body'), message.get('id'), message.get('ancestor_id')
-
-        _debug = False
         cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
         pigs_domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]
 
@@ -621,7 +607,6 @@ class test_mail(TestMailMockups):
         # CASE1: message_read with domain, threaded
         # We simulate an entire flow, using the expandables to test them
         # ----------------------------------------
-        _print_debug('\nCASE1: message_read with domain, threaded\n', _debug)
 
         # Do: read last message, threaded
         read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=1, thread_level=1)
@@ -633,7 +618,6 @@ class test_mail(TestMailMockups):
         # Data: get expandables
         new_threads_exp, new_msg_exp = None, None
         for msg in read_msg_list:
-            _print_msg(msg, _debug)
             if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('id') == -1:
                 new_threads_exp = msg
             elif msg.get('type') == 'expandable':
@@ -643,15 +627,12 @@ class test_mail(TestMailMockups):
         self.assertIsNotNone(new_msg_exp, 'message_read on last Pigs message should have returned a new messages expandable')
         domain = new_msg_exp.get('domain', [])
         # Test: expandable, conditions in domain
-        _print_debug('Executing %s' % domain, _debug)
         self.assertIn(('id', 'child_of', msg_id2), domain, 'new messages expandable domain should contain a child_of condition')
         self.assertIn(('id', '>=', msg_id4), domain, 'new messages expandable domain should contain an id greater than condition')
         self.assertIn(('id', '<=', msg_id8), domain, 'new messages expandable domain should contain an id less than condition')
         self.assertEqual(new_msg_exp.get('parent_id'), msg_id2, 'new messages expandable should have ancestor_id set to the thread header')
         # Do: message_read with domain, thread_level=0, parent_id=msg_id2 (should be imposed by JS)
         read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=200, thread_level=0, parent_id=msg_id2)
-        for msg in read_msg_list:
-            _print_msg(msg, _debug)
         read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
         # Test: other message in thread have been fetch
         self.assertEqual(set([msg_id4, msg_id6, msg_id8]), set(read_msg_ids), 'message_read in Pigs thread should return all the previous messages')
@@ -660,7 +641,6 @@ class test_mail(TestMailMockups):
         self.assertIsNotNone(new_threads_exp, 'message_read on last Pigs message should have returned a new threads expandable')
         domain = new_threads_exp.get('domain', [])
         # Test: expandable, conditions in domain
-        _print_debug('Executing %s' % domain, _debug)
         for condition in pigs_domain:
             self.assertIn(condition, domain, 'new threads expandable domain should contain the message_read domain parameter')
         self.assertFalse(new_threads_exp.get('parent_id'), 'new threads expandable should not have an ancestor_id')
@@ -674,7 +654,6 @@ class test_mail(TestMailMockups):
         # Data: get expandables
         new_threads_exp, new_msg_exp = None, None
         for msg in read_msg_list:
-            _print_msg(msg, _debug)
             if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('id') == -1:
                 new_threads_exp = msg
             elif msg.get('type') == 'expandable':
@@ -684,15 +663,12 @@ class test_mail(TestMailMockups):
         self.assertIsNotNone(new_msg_exp, 'message_read on Pigs message should have returned a new messages expandable')
         domain = new_msg_exp.get('domain', [])
         # Test: expandable, conditions in domain
-        _print_debug('Executing %s' % domain, _debug)
         self.assertIn(('id', 'child_of', msg_id1), domain, 'new messages expandable domain should contain a child_of condition')
         self.assertIn(('id', '>=', msg_id3), domain, 'new messages expandable domain should contain an id greater than condition')
         self.assertIn(('id', '<=', msg_id7), domain, 'new messages expandable domain should contain an id less than condition')
         self.assertEqual(new_msg_exp.get('parent_id'), msg_id1, 'new messages expandable should have ancestor_id set to the thread header')
         # Do: message_read with domain, thread_level=0, parent_id=msg_id1 (should be imposed by JS)
         read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=200, thread_level=0, parent_id=msg_id1)
-        for msg in read_msg_list:
-            _print_msg(msg, _debug)
         read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
         # Test: other message in thread have been fetch
         self.assertEqual(set([msg_id3, msg_id5, msg_id7]), set(read_msg_ids), 'message_read on the last Pigs message should also get its parent')
@@ -701,7 +677,6 @@ class test_mail(TestMailMockups):
         self.assertIsNotNone(new_threads_exp, 'message_read should have returned a new threads expandable')
         domain = new_threads_exp.get('domain', [])
         # Test: expandable, conditions in domain
-        _print_debug('Executing %s' % domain, _debug)
         for condition in pigs_domain:
             self.assertIn(condition, domain, 'general expandable domain should contain the message_read domain parameter')
         # Do: message_read with domain, thread_level=1 (should be imposed by JS)
@@ -710,13 +685,10 @@ class test_mail(TestMailMockups):
         # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
         self.assertEqual(len(read_msg_list), 1, 'message_read on Pigs should return 1 message because everything else has been fetched')
         self.assertEqual([msg_id0], read_msg_ids, 'message_read after 2 More should return only 1 last message')
-        for msg in read_msg_list:
-            _print_msg(msg, _debug)
 
         # ----------------------------------------
         # CASE2: message_read with domain, flat
         # ----------------------------------------
-        _print_debug('\nCASE2: message_read with domain, flat\n', _debug)
 
         # Do: read 2 lasts message, flat
         read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=2, thread_level=0)
@@ -729,7 +701,6 @@ class test_mail(TestMailMockups):
         # Data: get expandables
         new_threads_exp, new_msg_exp = None, None
         for msg in read_msg_list:
-            _print_msg(msg, _debug)
             if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('id') == -1:
                 new_threads_exp = msg
 
@@ -737,7 +708,6 @@ class test_mail(TestMailMockups):
         self.assertIsNotNone(new_threads_exp, 'message_read flat on the 2 last Pigs messages should have returns a new threads expandable')
         domain = new_threads_exp.get('domain', [])
         # Test: expandable, conditions in domain
-        _print_debug('Executing %s' % domain, _debug)
         for condition in pigs_domain:
             self.assertIn(condition, domain, 'new threads expandable domain should contain the message_read domain parameter')
         # Do: message_read with domain, thread_level=0 (should be imposed by JS)
@@ -747,8 +717,6 @@ class test_mail(TestMailMockups):
         self.assertEqual(len(read_msg_list), 9, 'message_read on Pigs should return 9 messages and 0 expandable')
         self.assertEqual([msg_id0, msg_id1, msg_id2, msg_id3, msg_id4, msg_id5, msg_id6, msg_id7, msg_id8], read_msg_ids,
             'message_read, More on flat, should return all remaning messages')
-        for msg in read_msg_list:
-            _print_msg(msg, _debug)
 
     def test_40_needaction(self):
         """ Tests for mail.message needaction. """
@@ -807,22 +775,11 @@ class test_mail(TestMailMockups):
         reply_msg = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: 1',
                                          extra='In-Reply-To: %s' % msg1.message_id)
         self.mail_group.message_process(cr, uid, None, reply_msg)
-        # TDE note: temp various asserts because of the random bug about msg1.child_ids
-        msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=1)
-        new_msg = self.mail_message.browse(cr, uid, msg_ids[0])
-        # if new_msg.parent_id.id != msg1.id:
-        #     import pdb
-        #     pdb.set_trace()
-        self.assertEqual(new_msg.parent_id, msg1, 'Newly processed mail_message (%d) should have msg1 as parent (msg2 is %d)' % (new_msg.id, msg2.id))
 
         # 2. References header
         reply_msg2 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: Re: 1',
                                          extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id)
         self.mail_group.message_process(cr, uid, None, reply_msg2)
-        # TDE note: temp various asserts because of the random bug about msg1.child_ids
-        msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=1)
-        new_msg = self.mail_message.browse(cr, uid, msg_ids[0])
-        self.assertEqual(new_msg.parent_id, msg1, 'Newly processed mail_message should have msg1 as parent')
 
         # 3. Subject contains [<ID>] + model passed to message+process -> only attached to group, not to mail
         reply_msg3 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com',

From 60e7f19ec5abca5463b4ea65819f99900730d98b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 26 Oct 2012 16:17:43 +0200
Subject: [PATCH 090/106] [IMP] mail: bind event

bzr revid: chm@openerp.com-20121026141743-m2kod12as9z2eale
---
 addons/mail/static/src/js/mail.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index f98e82481fa..5c41a38a91e 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -276,11 +276,11 @@ openerp.mail = function (session) {
             this.$el.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
 
             this.$el.on('click', '.oe_cancel', self.on_cancel );
-            this.$el.on('click', '.oe_post', function () {self.on_message_post()} );
-            this.$el.on('click', '.oe_full', function () {self.on_compose_fullmail('reply')} );
+            this.$el.on('click', '.oe_post', _.bind( this.on_message_post, this) );
+            this.$el.on('click', '.oe_full', _.bind( this.on_compose_fullmail, this, 'reply') );
 
             /* stack for don't close the compose form if the user click on a button */
-            this.$el.on('mousedown', 'div', function () { self.stay_open = true; });
+            this.$el.on('mousedown', '.oe_msg_footer', function () { self.stay_open = true; });
             this.$('textarea:not(.oe_compact):first').on('focus, mouseup, keydown', function () { self.stay_open = false; });
             this.$('textarea:not(.oe_compact):first').autosize();
 
@@ -389,7 +389,7 @@ openerp.mail = function (session) {
                         var message = thread.create_message_object( record[0] );
                         // insert the message on dom
                         thread.insert_message( message, self.$el );
-                        if (thread.parent_thread) {
+                        if (thread.parent_message) {
                             self.$el.remove();
                             self.parent_thread.compose_message = null;
                         } else {
@@ -410,7 +410,9 @@ openerp.mail = function (session) {
                 this.show_composer = !this.show_composer || this.stay_open;
                 this.reinit();
             }
-            this.$('textarea:not(.oe_compact):first').focus();
+            if (!this.stay_open && this.show_composer) {
+                this.$('textarea:not(.oe_compact):first').focus();
+            }
             return true;
         },
 
@@ -740,10 +742,10 @@ openerp.mail = function (session) {
             var self=this;
             //graphic effects  
             if (fadeTime) {
-                self.$el.fadeOut(options.fadeTime, function () {
+                self.$el.fadeOut(fadeTime, function () {
                     self.parent_thread.message_to_expandable(self);
                 });
-                self.thread.$el.fadeOut(options.fadeTime);
+                self.thread.$el.fadeOut(fadeTime);
             } else {
                 self.parent_thread.message_to_expandable(self);
             }

From 38f4a6137afe056ec7873570cc232a9450120a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 26 Oct 2012 16:57:58 +0200
Subject: [PATCH 091/106] [IMP] mail: improved followers widget layout

bzr revid: fva@openerp.com-20121026145758-sfwxii65fizb3nqa
---
 addons/mail/static/src/css/mail.css           | 13 +++++++++----
 addons/mail/static/src/js/mail.js             |  8 ++++----
 addons/mail/static/src/xml/mail_followers.xml |  6 ++++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 16d8a5ba24b..ef363661d8c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -31,6 +31,9 @@
     margin-bottom:0px;
     min-height:34px;
 }
+.openerp .oe_msg .oe_msg_intented:last-child(){
+    margin-bottom: 4px;
+}
 .openerp .oe_mail .oe_msg_indented .oe_msg_icon{
     width:32px;
     margin:1px;
@@ -255,7 +258,7 @@
 .openerp .oe_followers{
     position: relative;
     display: inline-block;
-    padding-top: 4px;
+    padding-top: 5px;
     width: 160px;
     float: right;
 }
@@ -295,15 +298,17 @@
 }
 
 .openerp .oe_followers .oe_subtype_list{
-    margin-bottom: 4px;
+    margin-top: 4px;
 }
 
 /*  b) THE FOLLOWERS */
 .openerp .oe_followers .oe_follower_title{
-    margin-top: 4px;
-    margin-bottom: 4px;
     display: inline;
 }
+.openerp .oe_followers .oe_follower_title_box{
+    margin-top: 12px;
+    margin-bottom: 4px;
+}
 .openerp .oe_followers .oe_invite{
     float: right;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 78aa3e8513d..67e66a6a11a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -542,7 +542,7 @@ openerp.mail = function (session) {
             }
             this.flag_used = true;
 
-            this.animated_destroy({'fadeTime':300});
+            this.animated_destroy({'fadeTime':200});
             this.parent_thread.message_fetch(this.domain, this.context);
             return false;
         },
@@ -791,7 +791,7 @@ openerp.mail = function (session) {
             event.stopPropagation();
             if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
             
-            this.animated_destroy({fadeTime:250});
+            this.animated_destroy({fadeTime:150});
             // delete this message and his childs
             var ids = [this.id].concat( this.get_child_ids() );
             this.ds_message.unlink(ids);
@@ -807,7 +807,7 @@ openerp.mail = function (session) {
 
             if ( (this.to_read && this.options.typeof_thread == 'inbox') ||
                 (!this.to_read && this.options.typeof_thread == 'archives')) {
-                this.animated_destroy({fadeTime:250});
+                this.animated_destroy({fadeTime:150});
             }
 
             // if this message is read, all childs message display is read
@@ -900,7 +900,7 @@ openerp.mail = function (session) {
                 } else {
                     button.removeClass('oe_starred');
                     if ( self.options.typeof_thread == 'stared' ) {
-                        self.animated_destroy({fadeTime:250});
+                        self.animated_destroy({fadeTime:150});
                     }
                 }
             });
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index df4fd0c7fd9..3ba38f067d0 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -17,8 +17,10 @@
         <t t-if="widget.comment">
             <h5 class="oe_comment"><t t-raw="widget.comment"/></h5>
         </t>
-        <h4 class='oe_follower_title'>Followers</h4>
-        <a href='#' class="oe_invite">Invite others</a>
+        <div class='oe_follower_title_box'>
+            <h4 class='oe_follower_title'>Followers</h4>
+            <a href='#' class="oe_invite">Invite others</a>
+        </div>
         <div class="oe_follower_list"></div>
     </div>
 

From b2bc5614a9b89c235b52f0ffc8eb2c6cc6cb8a82 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 26 Oct 2012 18:39:29 +0200
Subject: [PATCH 092/106] [IMP] mail: code pre review

bzr revid: chm@openerp.com-20121026163929-mx125ei97h01h42o
---
 addons/mail/static/src/js/mail.js   | 49 +++++++++--------------------
 addons/mail/static/src/xml/mail.xml |  2 +-
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5c41a38a91e..15f61a6309a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -174,17 +174,10 @@ openerp.mail = function (session) {
         /* upload the file on the server, add in the attachments list and reload display
          */
         display_attachments: function () {
-            var self = this;
-            var render = $(session.web.qweb.render('mail.thread.message.attachments', {'widget': self}));
-            if (!this.list_attachment) {
-                this.$('.oe_msg_attachment_list').replaceWith( render );
-            } else {
-                this.list_attachment.replaceWith( render );
-            }
-            this.list_attachment = this.$(".oe_msg_attachments");
-
+            this.$(".oe_msg_attachment_list").html( 
+                session.web.qweb.render('mail.thread.message.attachments', {'widget': this}) );
             // event: delete an attachment
-            this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
+            this.$(".oe_msg_attachment_list").on('click', '.oe_mail_attachment_delete', this.on_attachment_delete);
         },
 
         /* when a user click on the upload button, send file read on_attachment_loaded
@@ -270,41 +263,31 @@ openerp.mail = function (session) {
         bind_events: function () {
             var self = this;
 
-            this.$('textarea.oe_compact').on('focus', self.on_compose_expandable);
+            this.$('textarea.oe_compact').on('focus', _.bind( this.on_compose_expandable, this));
 
             // set the function called when attachments are added
-            this.$el.on('change', 'input.oe_form_binary_file', self.on_attachment_change );
+            this.$el.on('change', 'input.oe_form_binary_file', _.bind( this.on_attachment_change, this) );
 
-            this.$el.on('click', '.oe_cancel', self.on_cancel );
+            this.$el.on('click', '.oe_cancel', _.bind( this.on_cancel, this) );
             this.$el.on('click', '.oe_post', _.bind( this.on_message_post, this) );
             this.$el.on('click', '.oe_full', _.bind( this.on_compose_fullmail, this, 'reply') );
 
             /* stack for don't close the compose form if the user click on a button */
-            this.$el.on('mousedown', '.oe_msg_footer', function () { self.stay_open = true; });
-            this.$('textarea:not(.oe_compact):first').on('focus, mouseup, keydown', function () { self.stay_open = false; });
+            this.$el.on('mousedown', '.oe_msg_footer', _.bind( function () { this.stay_open = true; }, this));
+            this.$('textarea:not(.oe_compact):first').on('focus, mouseup, keydown', _.bind( function () { this.stay_open = false; }, this));
             this.$('textarea:not(.oe_compact):first').autosize();
 
             // auto close
-            this.$el.on('blur', 'textarea:not(.oe_compact):first', self.on_compose_expandable);
+            this.$el.on('blur', 'textarea:not(.oe_compact):first', _.bind( this.on_compose_expandable, this));
         },
 
         on_compose_fullmail: function (default_composition_mode) {
-            /* TDE note: I think this is not necessary, because
-             * 1/ post on a document: followers added server-side in _notify
-             * 2/ reply to a message: mail.compose.message should add the previous partners
-             */
-            var partner_ids = [];
-            for (var i in this.partner_ids) {
-                partner_ids.push(this.partner_ids[i][0]);
-            }
-
             if (default_composition_mode == 'reply') {
                 var context = {
                     'default_composition_mode': 'reply',
                     'default_parent_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
                     'default_attachment_ids': this.attachment_ids,
-                    'default_partner_ids': [], //partner_ids
                 };
             } else {
                 var context = {
@@ -316,7 +299,6 @@ openerp.mail = function (session) {
                     'default_parent_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
                     'default_attachment_ids': this.attachment_ids,
-                    'default_partner_ids': [], //partner_ids
                 };
             }
             var action = {
@@ -354,14 +336,12 @@ openerp.mail = function (session) {
         },
 
         /*post a message and fetch the message*/
-        on_message_post: function (body) {
+        on_message_post: function (event) {
             var self = this;
 
-            if (! body) {
-                var comment_node =  this.$('textarea:not(.oe_compact)');
-                var body = comment_node.val();
-                comment_node.val('');
-            }
+            var comment_node =  this.$('textarea');
+            var body = comment_node.val();
+            comment_node.val('');
 
             var attachments=[];
             for (var i in this.attachment_ids) {
@@ -404,9 +384,8 @@ openerp.mail = function (session) {
         /* convert the compact mode into the compose message
         */
         on_compose_expandable: function (event) {
-            if (event) event.stopPropagation();
 
-            if (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/)){
+            if (!this.stay_open && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
                 this.show_composer = !this.show_composer || this.stay_open;
                 this.reinit();
             }
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cbd2b263b87..05d42e0a6e2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -72,7 +72,7 @@
         <span class="oe_msg_attachments">
             <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
                 <div class="oe_attachment">
-                    <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
+                    <span t-if="(attachment.upload and attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
                             <span>...Upload in progress...</span>
                         </div>

From 0d4fdc41f9bec83c20ac66be62d4da066ba601c2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 29 Oct 2012 10:29:34 +0100
Subject: [PATCH 093/106] [FIX] mail: resolve error to read message after
 posting

bzr revid: chm@openerp.com-20121029092934-gqfg7gq90xs8w3k1
---
 addons/mail/mail_message.py       |  9 ---------
 addons/mail/res_users.py          |  4 ++--
 addons/mail/static/src/js/mail.js | 24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 6eb4edf25e3..e5e9dfce788 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -386,13 +386,6 @@ class mail_message(osv.Model):
                 ancestors and expandables
             :return list: list of message structure for the Chatter widget
         """
-        print domain
-        print message_unload_ids
-        print thread_level
-        print context
-        print parent_id
-        print limit
-
         assert thread_level in [0, 1], 'message_read() thread_level should be 0 (flat) or 1 (1 level of thread); given %s.' % thread_level
         domain = domain if domain is not None else []
         message_unload_ids = message_unload_ids if message_unload_ids is not None else []
@@ -432,8 +425,6 @@ class mail_message(osv.Model):
         self._message_read_add_expandables(cr, uid, message_list, read_messages, thread_level=thread_level,
             message_loaded_ids=message_unload_ids, domain=domain, parent_id=parent_id, context=context, limit=limit)
 
-        print message_list
-
         return message_list
 
     # TDE Note: do we need this ?
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 54b8a76703f..4ef2dda6d9c 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -112,7 +112,7 @@ class res_users(osv.Model):
         return res
 
     def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
-                        subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
+                        parent_id=False, attachment_ids=None, context=None, **kwargs):
         """ Redirect the posting of message on res.users to the related partner.
             This is done because when giving the context of Chatter on the
             various mailboxes, we do not have access to the current partner_id.
@@ -124,7 +124,7 @@ class res_users(osv.Model):
             thread_id = thread_id[0]
         partner_id = self.pool.get('res.users').read(cr, uid, thread_id, ['partner_id'], context=context)['partner_id'][0]
         return self.pool.get('res.partner').message_post_api(cr, uid, partner_id, body=body, subject=subject,
-            type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)
+            type=type, parent_id=parent_id, attachment_ids=attachment_ids, context=context, **kwargs)
 
     def message_post(self, cr, uid, thread_id, context=None, **kwargs):
         """ Redirect the posting of message on res.users to the related partner.
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 27ffdebfc5a..28ba0e66923 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -365,15 +365,17 @@ openerp.mail = function (session) {
                     ]).then(function (record) {
                         var thread = self.parent_thread;
                         // create object and attach to the thread object
-                        var message = thread.create_message_object( record[0] );
-                        // insert the message on dom
-                        thread.insert_message( message, self.$el );
-                        if (thread.parent_message) {
-                            self.$el.remove();
-                            self.parent_thread.compose_message = null;
-                        } else {
-                            self.on_cancel();
-                        }
+                        thread.message_fetch(false, false, [record], function (arg, data) {
+                            var message = thread.create_message_object( data[0] );
+                            // insert the message on dom
+                            thread.insert_message( message, self.$el );
+                            if (thread.parent_message) {
+                                self.$el.remove();
+                                self.parent_thread.compose_message = null;
+                            } else {
+                                self.on_cancel();
+                            }
+                        });
                         //session.web.unblockUI();
                     });
                 return true;
@@ -1107,7 +1109,7 @@ openerp.mail = function (session) {
          * @param {Object} replace_context: added to this.context
          * @param {Array} ids read (if the are some ids, the method don't use the domain)
          */
-        message_fetch: function (replace_domain, replace_context, ids) {
+        message_fetch: function (replace_domain, replace_context, ids, callback) {
             var self = this;
 
             // domain and context: options + additional
@@ -1119,7 +1121,7 @@ openerp.mail = function (session) {
             var nb_indented_thread = this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0;
 
             return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, nb_indented_thread, fetch_context, this.context.default_parent_id || undefined])
-                .then(this.proxy('switch_new_message'));
+                .then(callback ? _.bind(callback, this, arguments) : this.proxy('switch_new_message'));
         },
 
         /**

From c4e6506f8532792fdc9b9ce188cdd9ec78c7d2e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 29 Oct 2012 10:50:47 +0100
Subject: [PATCH 094/106] [FIX] mail.js: now giving an undefined (None) ids in
 message_read instead of a void list.

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

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 27ffdebfc5a..2f38045b419 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1409,7 +1409,7 @@ openerp.mail = function (session) {
                 'show_record_name' : false,
                 'show_compose_message' : false,
                 'show_compact_message' : false,
-                'message_ids': [],
+                'message_ids': undefined,
                 'no_message': false
             }, options);
 

From 4c969ed551561224ff13a63febf9215276440b31 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 29 Oct 2012 11:00:01 +0100
Subject: [PATCH 095/106] [FIX] mail: attachments when the user write on the
 wall

bzr revid: chm@openerp.com-20121029100001-ztsaakw1jt0flqmy
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index e0d4e102603..c5ec4c2b17a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -721,7 +721,7 @@ class mail_thread(osv.AbstractModel):
             ir_attachment = self.pool.get('ir.attachment')
             mail_message = self.pool.get('mail.message')
             filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [
-                ('res_model', '=', 'mail.message'),
+                ('res_model', '=', 'mail.compose.message'),
                 ('res_id', '=', 0),
                 ('create_uid', '=', uid),
                 ('id', 'in', attachment_ids)], context=context)

From cbf55bc07d979dac915a3d7314ee0979ec4d17ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 29 Oct 2012 11:09:10 +0100
Subject: [PATCH 096/106] [IMP] [FIX] mail: replying with the wizard does not
 quote the original message anymore. Updated tests.

bzr revid: tde@openerp.com-20121029100910-c0y6tl1zg2qsqfv5
---
 addons/mail/tests/test_mail.py             | 2 +-
 addons/mail/wizard/mail_compose_message.py | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index ea0db38fd26..85cfdca578c 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -533,7 +533,7 @@ class test_mail(TestMailMockups):
         self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message incorrect content_subtype')
         # Test: mail.message: subject as Re:.., body in html, parent_id
         self.assertEqual(compose.subject, _msg_reply, 'mail.message incorrect subject')
-        self.assertIn('Administrator wrote:<blockquote><pre>Pigs rules</pre></blockquote>', compose.body, 'mail.message body is incorrect')
+        # self.assertIn('Administrator wrote:<blockquote><pre>Pigs rules</pre></blockquote>', compose.body, 'mail.message body is incorrect')
         self.assertEqual(compose.parent_id and compose.parent_id.id, message.id, 'mail.message parent_id incorrect')
         # Test: mail.message: attachments
         for attach in compose.attachment_ids:
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index b93f6eea7a9..1bcbb0c2efc 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -156,8 +156,6 @@ class mail_compose_message(osv.TransientModel):
         reply_subject = tools.ustr(message_data.subject or '')
         if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)) and message_data.subject:
             reply_subject = "%s %s" % (re_prefix, reply_subject)
-        # create the reply in the body
-        reply_body = (context and context.get('default_body') or '')
         # get partner_ids from original message
         partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else []
 
@@ -166,7 +164,6 @@ class mail_compose_message(osv.TransientModel):
             'model': message_data.model,
             'res_id': message_data.res_id,
             'parent_id': message_data.id,
-            'body': reply_body,
             'subject': reply_subject,
             'partner_ids': partner_ids,
             'content_subtype': 'html',

From a2d3d1df80c044ed62a02e47d7dca242b385992d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 29 Oct 2012 11:12:30 +0100
Subject: [PATCH 097/106] [CLEAN] message_post_api: removed unnecessary type
 arg (posting is a comment).

bzr revid: tde@openerp.com-20121029101230-x39pep9p5edd54ml
---
 addons/mail/mail_thread.py        | 5 ++---
 addons/mail/res_users.py          | 5 ++---
 addons/mail/static/src/js/mail.js | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c5ec4c2b17a..e986f12b822 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -707,13 +707,12 @@ class mail_thread(osv.AbstractModel):
 
         return mail_message.create(cr, uid, values, context=context)
 
-    def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
-                        parent_id=False, attachment_ids=None, context=None):
+    def message_post_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False, attachment_ids=None, context=None):
         """ Wrapper on message_post, used only in Chatter (JS). The purpose is
             to handle attachments.
             # TDE FIXME: body is plaintext: convert it into html
         """
-        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type,
+        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type='comment',
                         subtype='mail.mt_comment', parent_id=parent_id, context=context)
 
         # HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 4ef2dda6d9c..1b6388111ba 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -111,8 +111,7 @@ class res_users(osv.Model):
         alias_pool.unlink(cr, uid, alias_ids, context=context)
         return res
 
-    def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification',
-                        parent_id=False, attachment_ids=None, context=None, **kwargs):
+    def message_post_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False, attachment_ids=None, context=None):
         """ Redirect the posting of message on res.users to the related partner.
             This is done because when giving the context of Chatter on the
             various mailboxes, we do not have access to the current partner_id.
@@ -124,7 +123,7 @@ class res_users(osv.Model):
             thread_id = thread_id[0]
         partner_id = self.pool.get('res.users').read(cr, uid, thread_id, ['partner_id'], context=context)['partner_id'][0]
         return self.pool.get('res.partner').message_post_api(cr, uid, partner_id, body=body, subject=subject,
-            type=type, parent_id=parent_id, attachment_ids=attachment_ids, context=context, **kwargs)
+            parent_id=parent_id, attachment_ids=attachment_ids, context=context)
 
     def message_post(self, cr, uid, thread_id, context=None, **kwargs):
         """ Redirect the posting of message on res.users to the related partner.
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6a409782117..0b6a8ec86d2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -358,7 +358,6 @@ openerp.mail = function (session) {
                         this.context.default_res_id, 
                         mail.ChatterUtils.get_text2html(body), 
                         false, 
-                        'comment', 
                         this.context.default_parent_id, 
                         attachments,
                         this.parent_thread.context

From d97ffd7b19249f3a9f72d3a91c9d23106bdf975b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 29 Oct 2012 12:21:17 +0100
Subject: [PATCH 098/106] [CLEAN] Misc cleaning of code: removed debug
 statements, added some notes.

bzr revid: tde@openerp.com-20121029112117-kup1q99c2nbkgar7
---
 addons/mail/__openerp__.py                  |  1 -
 addons/mail/mail_followers.py               | 12 +++-
 addons/mail/mail_message.py                 | 18 ++++--
 addons/mail/static/src/js/mail.js           | 71 +++++++++------------
 addons/mail/static/src/js/mail_followers.js |  8 +--
 5 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index cedc0e004dd..0c32ba27d6f 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -89,7 +89,6 @@ Main Features
         'static/lib/jquery.expander/jquery.expander.js',
         'static/src/js/mail.js',
         'static/src/js/mail_followers.js',
-        'static/src/js/mail_uploader.js',
     ],
     'qweb': [
         'static/src/xml/mail.xml',
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 416afa219d6..e8cf2648f29 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -84,10 +84,16 @@ class mail_notification(osv.Model):
         return False
 
     def set_message_read(self, cr, uid, msg_ids, read=None, context=None):
-        """ TDE note: add a comment, verify method calls, because js seems obfuscated. """
-        # TDE note: child_of to set unread ?
+        """ Set a message and its child messages as (un)read for uid.
+
+            :param bool read: read / unread
+        """
+        # TDE note: use child_of or front-end send correct values ?
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
-        notif_ids = self.search(cr, uid, [('partner_id', '=', user_pid), ('message_id', 'in', msg_ids)], context=context)
+        notif_ids = self.search(cr, uid, [
+            ('partner_id', '=', user_pid),
+            ('message_id', 'in', msg_ids)
+            ], context=context)
 
         # all message have notifications: already set them as (un)read
         if len(notif_ids) == len(msg_ids):
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index e5e9dfce788..bd0ade31b68 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -65,6 +65,7 @@ class mail_message(osv.Model):
     def _get_record_name(self, cr, uid, ids, name, arg, context=None):
         """ Return the related document name, using name_get. It is done using
             SUPERUSER_ID, to be sure to have the record name correctly stored. """
+        # TDE note: regroup by model/ids, to have less queries to perform
         result = dict.fromkeys(ids, False)
         for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):
             if not message.get('model') or not message.get('res_id'):
@@ -79,10 +80,11 @@ class mail_message(osv.Model):
         notif_obj = self.pool.get('mail.notification')
         notif_ids = notif_obj.search(cr, uid, [
             ('partner_id', 'in', [partner_id]),
-            ('message_id', 'in', ids)
+            ('message_id', 'in', ids),
+            ('read', '=', False),
         ], context=context)
         for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
-            res[notif.message_id.id] = not notif.read
+            res[notif.message_id.id] = True
         return res
 
     def _search_to_read(self, cr, uid, obj, name, domain, context=None):
@@ -117,9 +119,9 @@ class mail_message(osv.Model):
             help="Message type: email for email message, notification for system "\
                  "message, comment for other messages such as user replies"),
         'email_from': fields.char('From',
-            help="Email address of the sender, to use if it does not match any partner."),
+            help="Email address of the sender. This field is set when no matching partner is found for incoming emails."),
         'author_id': fields.many2one('res.partner', 'Author',
-            help="Partner that did write the message. If not set, try to use the From field instead."),
+            help="Author of the message. If not set, email_from may hold an email address that did not match any partner."),
         'partner_ids': fields.many2many('res.partner', string='Recipients'),
         'notified_partner_ids': fields.many2many('res.partner', 'mail_notification',
             'message_id', 'partner_id', 'Recipients'),
@@ -204,6 +206,7 @@ class mail_message(osv.Model):
 
             :param dict message: read result of a mail.message
         """
+        # TDE note: this method should be optimized, to lessen the number of queries, will be done ASAP
         is_author = False
         if message['author_id']:
             is_author = message['author_id'][0] == self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
@@ -321,7 +324,6 @@ class mail_message(osv.Model):
                 ], context=context, limit=self._message_read_more_limit)
             if not not_loaded_ids:
                 continue
-            # print 'not_loaded_ids', not_loaded_ids
 
             # all_not_loaded_ids += not_loaded_ids
             # group childs not read
@@ -386,6 +388,7 @@ class mail_message(osv.Model):
                 ancestors and expandables
             :return list: list of message structure for the Chatter widget
         """
+        # print 'message_read', ids, domain, message_unload_ids, thread_level, context, parent_id, limit
         assert thread_level in [0, 1], 'message_read() thread_level should be 0 (flat) or 1 (1 level of thread); given %s.' % thread_level
         domain = domain if domain is not None else []
         message_unload_ids = message_unload_ids if message_unload_ids is not None else []
@@ -458,9 +461,10 @@ class mail_message(osv.Model):
             - otherwise: remove the id
         """
         # Rules do not apply to administrator
+        # print '_search', uid, args
         if uid == SUPERUSER_ID:
             return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
-            context=context, count=count, access_rights_uid=access_rights_uid)
+                context=context, count=count, access_rights_uid=access_rights_uid)
         # Perform a super with count as False, to have the ids, not a counter
         ids = super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
             context=context, count=False, access_rights_uid=access_rights_uid)
@@ -630,6 +634,8 @@ class mail_message(osv.Model):
     # Messaging API
     #------------------------------------------------------
 
+    # TDE note: this code is not used currently, will be improved in a future merge, when quoted context
+    # will be added to email send for notifications. Currently only WIP.
     MAIL_TEMPLATE = """<div>
     % if message:
         ${display_message(message)}
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0b6a8ec86d2..766f5034fb0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -7,7 +7,7 @@ openerp.mail = function (session) {
     openerp_mail_followers(session, mail);        // import mail_followers.js
 
     /**
-         * ------------------------------------------------------------
+     * ------------------------------------------------------------
      * FormView
      * ------------------------------------------------------------
      * 
@@ -17,16 +17,15 @@ openerp.mail = function (session) {
 
     session.web.FormView = session.web.FormView.extend({
         do_action: function (action) {
-            console.log(action);
-
             if (action.res_model == 'mail.compose.message') {
                 /* hack for stop context propagation of wrong value
                  * delete this hack when a global method to clean context is create
                  */
                 var context_keys = ['default_template_id', 'default_composition_mode', 
                     'default_use_template', 'default_partner_ids', 'default_model',
-                    'default_res_id', 'default_content_subtype', 'active_id', 'lang',
-                    'bin_raw', 'tz', 'active_model', 'edi_web_url_view', 'active_ids', 'default_subject']
+                    'default_res_id', 'default_content_subtype', , 'default_subject',
+                    'default_body', 'active_id', 'lang', 'bin_raw', 'tz',
+                    'active_model', 'edi_web_url_view', 'active_ids']
                 for (var key in action.context) {
                     if (_.indexOf(context_keys, key) == -1) {
                         action.context[key] = null;
@@ -40,7 +39,7 @@ openerp.mail = function (session) {
 
 
     /**
-         * ------------------------------------------------------------
+     * ------------------------------------------------------------
      * ChatterUtils
      * ------------------------------------------------------------
      * 
@@ -53,20 +52,18 @@ openerp.mail = function (session) {
 
     mail.ChatterUtils = {
 
-        /**
-         *Get an image in /web/binary/image?... */
+        /* Get an image in /web/binary/image?... */
         get_image: function (session, model, field, id) {
             return session.prefix + '/web/binary/image?session_id=' + session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
-        /**
-         *Get the url of an attachment {'id': id} */
+        /* Get the url of an attachment {'id': id} */
         get_attachment_url: function (session, attachment) {
             return session.origin + '/web/binary/saveas?session_id=' + session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id=' + attachment['id'];
         },
 
         /**
-         *Replaces some expressions
+         * Replaces some expressions
          * - :name - shortcut to an image
          */
         do_replace_expressions: function (string) {
@@ -83,23 +80,23 @@ openerp.mail = function (session) {
             return string;
         },
 
-        /* replace textarea text into html text
-         * (add <p>, <a>)
-         * TDE note : should not be here, but server-side I think ...
-        */
+        /**
+         * Replaces textarea text into html text (add <p>, <a>)
+         * TDE note : should be done server-side, in Python -> use mail.compose.message ?
+         */
         get_text2html: function (text) {
             return text
                 .replace(/[\n\r]/g,'<br/>')
                 .replace(/((?:https?|ftp):\/\/[\S]+)/g,'<a href="$1">$1</a> ')
         },
 
-        /**
-         * return the complete domain with "&"
+        /* Returns the complete domain with "&" 
+         * TDE note: please add some comments to explain how/why
          */
-        expend_domain: function (domain) {
+        expand_domain: function (domain) {
             var new_domain = [];
             var nb_and = -1;
-            
+            // TDE note: smarted code maybe ?
             for ( var k = domain.length-1; k >= 0 ; k-- ) {
                 if ( typeof domain[k] != 'array' && typeof domain[k] != 'object' ) {
                     nb_and -= 2;
@@ -118,16 +115,15 @@ openerp.mail = function (session) {
 
 
     /**
-         * ------------------------------------------------------------
+     * ------------------------------------------------------------
      * ComposeMessage widget
      * ------------------------------------------------------------
      * 
      * This widget handles the display of a form to compose a new message.
      * This form is a mail.compose.message form_view.
-     * On first time : display a compact textarea but is not the compose form.
-     * When the user focus this box, the compose message is intantiate and 
-     * with focus on the textarea.
-    */
+     * On first time : display a compact textarea that is not the compose form.
+     * When the user focuses the textarea, the compose message is instantiated.
+     */
     
     mail.ThreadComposeMessage = session.web.Widget.extend({
         template: 'mail.compose_message',
@@ -284,7 +280,7 @@ openerp.mail = function (session) {
         on_compose_fullmail: function (default_composition_mode) {
             if (default_composition_mode == 'reply') {
                 var context = {
-                    'default_composition_mode': 'reply',
+                    'default_composition_mode': default_composition_mode,
                     'default_parent_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
                     'default_attachment_ids': this.attachment_ids,
@@ -292,10 +288,9 @@ openerp.mail = function (session) {
             } else {
                 var context = {
                     'default_model': this.context.default_model,
-                    'default_res_model': this.context.default_model,
                     'default_res_id': this.context.default_res_id,
                     'default_content_subtype': 'html',
-                    'default_composition_mode': 'comment',
+                    'default_composition_mode': default_composition_mode,
                     'default_parent_id': this.id,
                     'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
                     'default_attachment_ids': this.attachment_ids,
@@ -411,7 +406,7 @@ openerp.mail = function (session) {
     });
 
     /**
-         * ------------------------------------------------------------
+     * ------------------------------------------------------------
      * Thread Message Expandable Widget
      * ------------------------------------------------------------
      *
@@ -501,7 +496,7 @@ openerp.mail = function (session) {
     });
 
     /**
-         * ------------------------------------------------------------
+     * ------------------------------------------------------------
      * Thread Message Widget
      * ------------------------------------------------------------
      * This widget handles the display of a messages in a thread. 
@@ -588,9 +583,7 @@ openerp.mail = function (session) {
             this.ds_follow = new session.web.DataSetSearch(this, 'mail.followers');
         },
 
-        /**
-         *Convert date, timerelative and avatar in displayable data.
-        */
+        /* Convert date, timerelative and avatar in displayable data. */
         formating_data: function () {
 
             //formating and add some fields for render
@@ -665,9 +658,7 @@ openerp.mail = function (session) {
             this.$el.on('click', '.oe_star', this.on_star);
         },
 
-        /**
-         * call the on_compose_message on the thread of this message.
-         */
+        /* Call the on_compose_message on the thread of this message. */
         on_message_reply:function (event) {
             event.stopPropagation();
             this.thread.on_compose_message();
@@ -686,7 +677,7 @@ openerp.mail = function (session) {
         },
 
         /**
-         * instantiate the thread object of this message.
+         * Instantiate the thread object of this message.
          * Each message have only one thread.
          */
         create_thread: function () {
@@ -1294,8 +1285,8 @@ openerp.mail = function (session) {
 
             if ( msg_up && msg_up.type == "expandable" && msg_down && msg_down.type == "expandable") {
                 // concat two expandable message and add this message to this dom
-                msg_up.domain = mail.ChatterUtils.expend_domain( msg_up.domain );
-                msg_down.domain = mail.ChatterUtils.expend_domain( msg_down.domain );
+                msg_up.domain = mail.ChatterUtils.expand_domain( msg_up.domain );
+                msg_down.domain = mail.ChatterUtils.expand_domain( msg_down.domain );
 
                 msg_down.domain = ['|','|'].concat( msg_up.domain ).concat( message_dom ).concat( msg_down.domain );
 
@@ -1310,7 +1301,7 @@ openerp.mail = function (session) {
 
             } else if ( msg_up && msg_up.type == "expandable") {
                 // concat preview expandable message and this message to this dom
-                msg_up.domain = mail.ChatterUtils.expend_domain( msg_up.domain );
+                msg_up.domain = mail.ChatterUtils.expand_domain( msg_up.domain );
                 msg_up.domain = ['|'].concat( msg_up.domain ).concat( message_dom );
                 
                 msg_up.nb_messages++;
@@ -1319,7 +1310,7 @@ openerp.mail = function (session) {
 
             } else if ( msg_down && msg_down.type == "expandable") {
                 // concat next expandable message and this message to this dom
-                msg_down.domain = mail.ChatterUtils.expend_domain( msg_down.domain );
+                msg_down.domain = mail.ChatterUtils.expand_domain( msg_down.domain );
                 msg_down.domain = ['|'].concat( msg_down.domain ).concat( message_dom );
                 
                 // it's maybe a message expandable for the max limit read message
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 7fed5371600..a13d2048bf3 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -115,8 +115,8 @@ openerp_mail_followers = function(session, mail) {
             }).pipe(self.proxy('display_generic'));
         },
         _format_followers: function(count){
-            console.log('FORMAT FOLLWERS :',count);
-            function _t(str){return str;}
+            // TDE note: why redefining _t ?
+            function _t(str) { return str; }
             var str = '';
             if(count <= 0){
                 str = _t('No followers');
@@ -125,7 +125,6 @@ openerp_mail_followers = function(session, mail) {
             }else{
                 str = ''+count+' '+_t('followers');
             }
-            console.log('URGH:',str);
             return str;
         },
         /* Display generic info about follower, for people not having access to res_partner */
@@ -149,7 +148,8 @@ openerp_mail_followers = function(session, mail) {
                 record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(node_user_list);
             });
-            if (truncated.length < records.length) { //FIXME USE A TEMPLATE !
+            // FVA note: be sure it is correctly translated
+            if (truncated.length < records.length) {
                 $('<div class="oe_partner">And ' + (records.length - truncated.length) + ' more.</div>').appendTo(node_user_list);
             }
         },

From 81df392b715a4ebf299f52327f0dc740ce4be3ca Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 29 Oct 2012 12:22:54 +0100
Subject: [PATCH 099/106] [IMP] mail: openchatter, reduce DOM item

bzr revid: chm@openerp.com-20121029112254-e0az3mi3vmmk83ca
---
 addons/mail/static/src/js/mail.js   | 14 +++++---------
 addons/mail/static/src/xml/mail.xml |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 766f5034fb0..8d439f59826 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -611,7 +611,9 @@ openerp.mail = function (session) {
             this.$el.hide().fadeIn(750, function () {$(this).css('display', '');});
             this.resize_img();
             this.bind_events();
-            this.create_thread();
+            if(this.thread_level < this.options.display_indented_thread) {
+                this.create_thread();
+            }
             this.$('.oe_msg_attachments, .oe_msg_images').addClass("oe_hidden");
         },
 
@@ -915,11 +917,6 @@ openerp.mail = function (session) {
         
         start: function () {
             this._super.apply(this, arguments);
-
-            if (this.show_compose_message) {
-                this.instantiate_compose_message();
-            }
-
             this.bind_events();
         },
 
@@ -1195,11 +1192,10 @@ openerp.mail = function (session) {
 
             var sort = (!!self.thread_level || message.id<0);
 
-
             if (sort) {
                 if (message_older) {
 
-                    message.insertAfter(message_older.thread.compose_message ? message_older.thread.compose_message.$el : message_older.thread.$el);
+                    message.insertAfter(message_older.thread ? (message_older.thread.compose_message ? message_older.thread.compose_message.$el : message_older.thread.$el) : message_older.$el);
 
                 } else if (message_newer) {
 
@@ -1220,7 +1216,7 @@ openerp.mail = function (session) {
 
                 } else if (message_newer) {
 
-                    message.insertAfter(message_newer.thread.compose_message ? message_newer.thread.compose_message.$el : message_newer.thread.$el);
+                    message.insertAfter(message_newer.thread ? (message_newer.thread.compose_message ? message_newer.thread.compose_message.$el : message_newer.thread.$el) : message_newer.$el );
 
                 } else if (message.id < 0) {
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 3d0fc323de8..ecd7fa44efb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -40,7 +40,7 @@
         <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
-        <span t-if="!widget.show_compact_message and !widget.show_composer" class="oe_placeholder_self"></span>
+        <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
     </t>
 
     <!--

From 79669aaf9b3324b75397fb79e3c7f98302f65efa Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 29 Oct 2012 12:31:45 +0100
Subject: [PATCH 100/106] [FIX] mail: compose message with reduce DOM

bzr revid: chm@openerp.com-20121029113145-50gx1qdu3co3jd0c
---
 addons/mail/static/src/js/mail.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8d439f59826..5b42620b260 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -663,6 +663,7 @@ openerp.mail = function (session) {
         /* Call the on_compose_message on the thread of this message. */
         on_message_reply:function (event) {
             event.stopPropagation();
+            this.create_thread();
             this.thread.on_compose_message();
             return false;
         },
@@ -1105,9 +1106,9 @@ openerp.mail = function (session) {
             var message_loaded_ids = this.id ? [this.id].concat( self.get_child_ids() ) : self.get_child_ids();
 
             // CHM note : option for sending in flat mode by server
-            var nb_indented_thread = this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0;
+            var thread_level = this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0;
 
-            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, nb_indented_thread, fetch_context, this.context.default_parent_id || undefined])
+            return this.ds_message.call('message_read', [ids, fetch_domain, message_loaded_ids, thread_level, fetch_context, this.context.default_parent_id || undefined])
                 .then(callback ? _.bind(callback, this, arguments) : this.proxy('switch_new_message'));
         },
 

From 530b946b32ccc64f342605ca6ca10c4610f0b65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 29 Oct 2012 13:35:32 +0100
Subject: [PATCH 101/106] [IMP] [FIX] base_calendar: read only required fields;
 first try to fix the runbot infinite loop bug.

bzr revid: tde@openerp.com-20121029123532-okl3q2dtnhq4a2xv
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index cbdc43b23af..f52fcbf99f9 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1151,7 +1151,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             context = {}
 
         result = []
-        for data in super(calendar_event, self).read(cr, uid, select, context=context):
+        for data in super(calendar_event, self).read(cr, uid, select, ['rrule', 'exdate', 'exrule'], context=context):
             if not data['rrule']:
                 result.append(data['id'])
                 continue

From 01e2d11863eeed714d40deebe45e50b4183b5c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 29 Oct 2012 14:03:33 +0100
Subject: [PATCH 102/106] [IMP] improved padding between messages

bzr revid: fva@openerp.com-20121029130333-388iwp76wozfzqsj
---
 addons/mail/static/src/css/mail.css | 60 ++++++++++++++++-------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 13de1ec09e3..eab8860442e 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -22,29 +22,9 @@
     background: #F4F5FA;
     border-radius: 2px;
     margin-bottom: 2px;
-    min-height: 40px;
+    min-height: 42px;
     border: solid 1px rgba(0,0,0,0.03);
 }
-.openerp .oe_mail .oe_msg_indented{
-    background: #FFF;
-    border: none;
-    margin-bottom:0px;
-    min-height:34px;
-}
-.openerp .oe_msg .oe_msg_intented:last-child(){
-    margin-bottom: 4px;
-}
-.openerp .oe_mail .oe_msg_indented .oe_msg_icon{
-    width:32px;
-    margin:1px;
-    border-radius:2px;
-}
-.openerp .oe_mail .oe_msg .oe_subtle{
-    color: #B7B7D5;
-}
-.openerp .oe_mail .oe_msg_indented .oe_msg_center{
-    margin-left:34px;
-}
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
     left:0; top: 0; bottom: 0; width: 40px;
@@ -77,6 +57,38 @@
     margin-bottom: 0px;
     margin-top: 2px;
 }
+
+/* a) Indented Messages */
+
+.openerp .oe_mail .oe_msg_indented{
+    background: #FFF;
+    border: none;
+    margin-bottom:0px;
+    min-height:38px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_icon{
+    width:32px;
+    margin:2px;
+    border-radius:2px;
+}
+.openerp .oe_mail .oe_msg .oe_subtle{
+    color: #B7B7D5;
+}
+.openerp .oe_mail .oe_msg_indented .oe_msg_center{
+    margin-left:34px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_content{
+    padding-top:2px;
+}
+
+/* b) Message action icons */
+
+.openerp .oe_mail .oe_msg.oe_msg_unread .oe_unread{
+    display:none;
+}
+.openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
+    display:none;
+}
 .openerp .oe_mail .oe_msg .oe_msg_icons{
     float: right;
     margin-top: 4px;
@@ -140,12 +152,6 @@
     width: 100%;
 }
 
-.openerp .oe_mail .oe_msg.oe_msg_unread .oe_unread{
-    display:none;
-}
-.openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
-    display:none;
-}
 /* ---------------- MESSAGE QUICK COMPOSER --------------- */
 
 .openerp .oe_mail .oe_msg_composer .oe_msg_footer{

From 46718679f3ba1d7a88ecd448e36fa64430ff09a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 29 Oct 2012 14:06:56 +0100
Subject: [PATCH 103/106] [FIX] Fixing last fix, forgot a field.

bzr revid: tde@openerp.com-20121029130656-et7vfu2nepxezb31
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index f52fcbf99f9..bb432aa4d61 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1151,7 +1151,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             context = {}
 
         result = []
-        for data in super(calendar_event, self).read(cr, uid, select, ['rrule', 'exdate', 'exrule'], context=context):
+        for data in super(calendar_event, self).read(cr, uid, select, ['rrule', 'exdate', 'exrule', 'date'], context=context):
             if not data['rrule']:
                 result.append(data['id'])
                 continue

From 930be38e8b793a4f6b50697d1fafb5daca02a972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 29 Oct 2012 14:09:37 +0100
Subject: [PATCH 104/106] [IMP] moved the follower's subtype checkbox to the
 left

bzr revid: fva@openerp.com-20121029130937-ihwacro4q9jl3h7y
---
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 3ba38f067d0..3dec4ef1dd2 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -40,8 +40,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td><label t-att-for="'input_mail_followers_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_'+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>

From 54a945f63c8329bb66d3db3015ec3f28d2c39715 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 29 Oct 2012 15:28:56 +0100
Subject: [PATCH 105/106] [IMP] mail: openchatter fadeout fix

bzr revid: chm@openerp.com-20121029142856-kd2mnje5w4ee5x3t
---
 addons/mail/static/src/js/mail.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5b42620b260..9133e5de257 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -711,7 +711,9 @@ openerp.mail = function (session) {
             this.$el.fadeOut(fadeTime, function () {
                 self.parent_thread.message_to_expandable(self);
             });
-            this.thread.$el.fadeOut(fadeTime);
+            if (this.thread) {
+                this.thread.$el.fadeOut(fadeTime);
+            }
         },
 
         /**

From 9d0e42e3bcbb3718a010cd52107213599ca0bf21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 29 Oct 2012 15:45:03 +0100
Subject: [PATCH 106/106] [IMP] css: design for 'likes'

bzr revid: fva@openerp.com-20121029144503-tc124u71b2qijclx
---
 addons/mail/static/src/css/mail.css | 21 ++++++++++++++++++++-
 addons/mail/static/src/xml/mail.xml | 15 +++------------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index eab8860442e..af3cc3ed359 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -80,8 +80,27 @@
 .openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_content{
     padding-top:2px;
 }
+/* b) Votes (likes) */
+.openerp .oe_mail .oe_mail_vote_count{
+    display: inline;
+    position: relative;
+    background: #7C7BAD;
+    color: white;
+    text-shadow: none;
+    border-radius: 3px;
+    margin: 0px;
+    padding-left: 3px;
+    padding-right: 18px;
+    margin-right: 3px;
+}
+.openerp .oe_mail .oe_mail_vote_count .oe_e{
+    position: absolute;
+    bottom: 1px;
+    right: 2px;
+    font-size: 26px;
+}
 
-/* b) Message action icons */
+/* c) Message action icons */
 
 .openerp .oe_mail .oe_msg.oe_msg_unread .oe_unread{
     display:none;
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ecd7fa44efb..caa85cd3deb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -258,18 +258,9 @@
     -->
     <span t-name="mail.thread.message.vote">
         
-        <span class="oe_mail_vote_count">
-            <t t-if='widget.has_voted'>
-                You
-            </t>
-            <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
-                <t t-if='widget.has_voted'> and </t>
-                <t t-raw="(widget.vote_nb - (widget.has_voted ? 1 : 0))"/>
-                <t t-esc="widget.vote_nb"/> people
-            </t>
-            <t t-if='widget.vote_nb'>
-                like
-            </t>
+        <span class="oe_mail_vote_count" t-if='widget.vote_nb > 0'>
+            <t t-raw='widget.vote_nb' />
+            <span class='oe_e'>8</span>
         </span>
         <a href='#' t-attf-class="oe_msg_vote">
             <t t-if="!widget.has_voted">like</t>