From 8303bef9ba219c6f4d2633062486b5c611a2a578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Sep 2012 13:14:44 +0200
Subject: [IMP] Chatter: added support for attachments.

bzr revid: tde@openerp.com-20120906111444-n7bsjv0f10p9c3x4
---
 addons/mail/static/src/xml/mail.xml | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f6be765c603..49e861ac870 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -73,6 +73,20 @@
         </div>
     </t>
 
+    <!--
+        mail.compose_message.add_attachment template
+        Small template to be inserted in the composition form to add attachments
+        -->
+    <t t-name="mail.compose_message.add_attachment">
+        <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" t-att-value="widget.options.context.default_model"/>
+            <input type="hidden" name="id" t-att-value="widget.options.context.default_res_id"/>
+            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+        </t>
+    </t>
+
     <!--
         thread template
         This template holds a thread of comments. It begins with an actions
@@ -142,15 +156,23 @@
                     </ul>
                     <t t-if="record.attachment_ids.length > 0">
                         <div class="oe_clear"></div>
-                        <ul class="oe_mail_msg_attachments">
-                            <t t-foreach="record.attachments" t-as="attachment">
-                                <li> <a t-att-href="attachment.url"><t t-raw="attachment.name"/></a> </li>
-                            </t>
-                        </ul>
+                        <t t-call="mail.thread.message.attachments"/>
                     </t>
                 </div>
             </div>
         </div>
     </li>
 
+    <!--
+        mail.thread.message.attachments template
+        Template used to display attachments in a mail.message
+        -->
+    <t t-name="mail.thread.message.attachments">
+        <ul class="oe_mail_msg_attachments">
+            <t t-foreach="record.attachment_ids" t-as="attachment">
+                <li><a t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a></li>
+            </t>
+        </ul>
+    </t>
+
 </template>
-- 
cgit v1.2.3


From 9b9bdae9e008e930eaf1cf208b90f66bdbdf4e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 6 Sep 2012 15:42:01 +0200
Subject: [IMP] composer: attachments are attached to the mail.compose.message
 record, not the related document anymore. This way, when deleting the
 mail.compose.message, attachments will be unlinked. Added deletion cascaded
 to res_model and res_id = 0, because of attachments added on a
 not-already-saved composer. BTW, cleaned mail/__openerp__.py.

bzr revid: tde@openerp.com-20120906134201-8845xov0mjbxh8mr
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 49e861ac870..161c5e2fcbc 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -81,8 +81,8 @@
         <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" t-att-value="widget.options.context.default_model"/>
-            <input type="hidden" name="id" t-att-value="widget.options.context.default_res_id"/>
+            <input type="hidden" name="model" t-att-value="widget.form_view.model"/>
+            <input type="hidden" name="id" t-att-value="widget.form_view.datarecord.id || 0"/>
             <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
         </t>
     </t>
-- 
cgit v1.2.3


From 8aba3e02104ae4ba8551f3895182b457a64a0f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 18:17:00 +0200
Subject: [IMP] Chatter: added option to delete attachments in composer.

bzr revid: tde@openerp.com-20120911161700-ty7h844h6f0t7nea
---
 addons/mail/static/src/xml/mail.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 18204c05f5b..c3787f50122 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -169,7 +169,12 @@
     <t t-name="mail.thread.message.attachments">
         <ul class="oe_mail_msg_attachments">
             <t t-foreach="record.attachment_ids" t-as="attachment">
-                <li><a t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a></li>
+                <li>
+                    <a t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a>
+                    <t t-if="record.show_attachment_delete">
+                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
+                    </t>
+                </li>
             </t>
         </ul>
     </t>
-- 
cgit v1.2.3


From 309e2353c6ddbc1e60d9bd7aac7149a2c5f67b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 18:24:15 +0200
Subject: [CLEAN] mail.js: some cleaning in Wall and RecordThread.

bzr revid: tde@openerp.com-20120911162415-altimitaw1nz2r03
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c3787f50122..601270cc98f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -39,8 +39,8 @@
         wall_thread_container template for the wall
         Each discussion thread is contained inside this template
         -->
-    <t t-name="mail.wall_thread_container">
-    </t>
+    <li t-name="mail.wall_thread_container" class="oe_mail_wall_thread">
+    </li>
 
     <!--
         record_thread main template
-- 
cgit v1.2.3


From 1bd02156eb6aa2f7bfe713c4ba4785310ea1f40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 11 Sep 2012 18:38:53 +0200
Subject: [IMP] mail.js: cleaned link behavior (not href anymore, delegated
 function for message_delete and message_read).

bzr revid: tde@openerp.com-20120911163853-y7g769dp53jym028
---
 addons/mail/static/src/xml/mail.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 601270cc98f..da1ba28b849 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -115,14 +115,14 @@
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
                         <t t-if="record.is_author">
-                            <li t-if="display['show_delete']"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                            <li t-if="display['show_delete']"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
+                        <li t-if="display['show_hide']"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</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='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li> -->
-                        <li><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
+                        <li><a t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
@@ -142,12 +142,12 @@
                       <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a></li>
                       <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-                      <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
+                      <li t-if="display['show_reply']"><a class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote
                       <li><a href="#">Like</a></li>
                       -->
                       <li t-if="record.attachment_ids.length > 0">
-                          <a href="#" class="oe_mail_msg_view_attachments">
+                          <a class="oe_mail_msg_view_attachments">
                               <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
                               <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
                           </a>
-- 
cgit v1.2.3


From ab82f7a9acc6273bdba123083cbd1b0b77f7b6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Sep 2012 11:21:43 +0200
Subject: [IMP] mail.js: fixed cleaning of composer after posting a comment;
 cleaned a bit js and css.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index da1ba28b849..09da919a78d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -132,10 +132,10 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div class="oe_mail_msg_body">
-                        <div class="oe_mail_msg_record_body">
+                        <t t-if="display.show_record_name">
                             <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
-                            <t t-raw="record.body"/>
-                        </div>
+                        </t>
+                        <t t-raw="record.body"/>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
-- 
cgit v1.2.3


From 6de7585204c8d6d7625ee243a7ca0269a0f87da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 12 Sep 2012 12:22:17 +0200
Subject: [CLEAN] mail.js: cleaned init of Thread widget (do not pass
 everything in options, but explicitely domain, context, options). Cleaned
 some var names, propagated change in code. Added reply_by_email for a reply
 link that does a quote and reply. Dropdown options are now prefixed with a
 dd.

bzr revid: tde@openerp.com-20120912102217-q6xnkn749how9en4
---
 addons/mail/static/src/xml/mail.xml | 43 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 09da919a78d..4d3b56cf62f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -114,16 +114,14 @@
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
-                        <t t-if="record.is_author">
-                            <li t-if="display['show_delete']"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-                        </t>
-                        <li t-if="display['show_hide']"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
+                        <li t-if="record.is_author &amp; options.show_dd_delete"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                        <li t-if="options.show_dd_hide"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</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='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li> -->
-                        <li><a t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
-                        <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
+                        <li t-if="options.show_dd_reply_by_email"><a class="oe_mail_msg_reply_by_email" t-attf-data-msg_id="{record.id}">Quote and reply</a></li>
+                        <li t-if="record.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&amp;id=#{record.id}" >Details</a></li>
                     </ul>
                 </span>
                 <!-- message itself -->
@@ -132,26 +130,29 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div class="oe_mail_msg_body">
-                        <t t-if="display.show_record_name">
-                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
+                        <t t-if="options.show_record_name &amp; (!record.subject) &amp; (options.thread_level > 0)">
+                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
                         </t>
                         <t t-raw="record.body"/>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
-                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a></li>
-                      <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
-                      <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-                      <li t-if="display['show_reply']"><a class="oe_mail_msg_reply">Reply</a></li>
-                      <!-- uncomment when merging vote
-                      <li><a href="#">Like</a></li>
-                      -->
-                      <li t-if="record.attachment_ids.length > 0">
-                          <a class="oe_mail_msg_view_attachments">
-                              <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
-                              <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
-                          </a>
-                      </li>
+                        <li t-if="options.show_record_name &amp; record.subject &amp; options.thread_level > 0">
+                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
+                        </li>
+                        <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
+                        <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
+                        <li t-if="options.show_reply"><a class="oe_mail_msg_reply">Reply</a></li>
+                        <li t-if="options.show_reply_by_email"><a class="oe_mail_msg_reply_by_email" t-attf-data-msg_id="{record.id}">Reply</a></li>
+                        <!-- uncomment when merging vote
+                        <li><a href="#">Like</a></li>
+                        -->
+                        <li t-if="record.attachment_ids.length > 0">
+                            <a class="oe_mail_msg_view_attachments">
+                                <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
+                                <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
+                            </a>
+                        </li>
                     </ul>
                     <t t-if="record.attachment_ids.length > 0">
                         <div class="oe_clear"></div>
-- 
cgit v1.2.3