Revert "[FIX] mail: read more show original message"

This reverts commit 0790682296e43989e4e232189009c3ba380e32ba.

This fix is not yet ready. See PR #3295

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index be88fa9..8ac047f 100644 (file)
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -373,7 +373,6 @@ class mail_message(osv.Model):
                 'type': message.type,
                 'subtype': message.subtype_id.name if message.subtype_id else False,
                 'body': body_html,
-                'body_original': message.body if message.type == 'email' else None,
                 'model': message.model,
                 'res_id': message.res_id,
                 'record_name': message.record_name,

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 094a4f7..1f65058 100644 (file)
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -225,7 +225,6 @@ openerp.mail = function (session) {
             this.name = datasets.name ||  false,
             this.record_name = datasets.record_name ||  false,
             this.body = datasets.body || '',
-            this.body_original = datasets.body_original || '',
             this.vote_nb = datasets.vote_nb || 0,
             this.has_voted = datasets.has_voted ||  false,
             this.is_favorite = datasets.is_favorite ||  false,
@@ -977,7 +976,6 @@ openerp.mail = function (session) {
         },
 
         expender: function () {
-            var self = this;
             this.$('.oe_msg_body:first').expander({
                 slicePoint: this.options.truncate_limit,
                 expandText: _t('read more'),
@@ -985,15 +983,7 @@ openerp.mail = function (session) {
                 detailClass: 'oe_msg_tail',
                 moreClass: 'oe_mail_expand',
                 lessClass: 'oe_mail_reduce',
-                afterExpand: function(){
-                    self.$('.oe_msg_body').hide();
-                    self.$('.oe_msg_original').show();
-                },
-                onCollapse: function(){
-                    self.$('.oe_msg_body').show();
-                    self.$('.oe_msg_original').hide();
-                },
-            });
+                });
         },
 
         /**

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e57b9d7..1e52105 100644 (file)
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -257,10 +257,7 @@
                         <t t-if="widget.subject" t-esc="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <t t-raw="!widget.body_original || widget.body.length > widget.options.truncate_limit ? widget.body: widget.body_original"/>
-                    </div>
-                    <div t-if="widget.body_original" class="oe_msg_original" style="display:none;">
-                        <t t-raw="widget.body_original"/>
+                        <t t-raw="widget.body"/>
                     </div>
                 </div>
                 <div class="oe_msg_footer">