From 99612b95c0f013439033165558addf58f0890cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 7 Sep 2012 16:40:13 +0200 Subject: [FIX] mail.js: fixed wrong res_id passed into subthreads; fixed message_post using a wrong dataset; fixed message_post calling message_fetch after posting with a proxy that gave default values, use a then without args instead. bzr revid: tde@openerp.com-20120907144013-k7dfq1otoykuth96 --- addons/mail/static/src/js/mail.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'addons/mail/static/src') diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index a5a64a59a8b..20218a2bb88 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -411,7 +411,7 @@ openerp.mail = function(session) { self.thread = new mail.Thread(self, { 'context': { 'default_model': record.model, - 'default_id': record.res_id, + 'default_res_id': record.res_id, 'default_parent_id': record.id }, 'message_data': record.child_ids, 'thread_level': self.options.thread_level-1, 'show_header_compose': false, 'show_reply': self.options.thread_level > 1, @@ -484,9 +484,9 @@ openerp.mail = function(session) { var body = comment_node.val(); comment_node.val(''); } - return this.ds_post.call('message_post', [ - [this.options.context.res_id], body, false, 'comment', this.options.context.parent_id] - ).then(this.proxy('message_fetch')); + return this.ds_thread.call('message_post', [ + [this.options.context.default_res_id], body, false, 'comment', this.options.context.default_parent_id, undefined] + ).then(self.message_fetch()); }, /** Action: 'shows more' to fetch new messages */ -- cgit v1.2.3 From dcc971af069e2173a304f52163b77acc5d0f4f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 7 Sep 2012 17:08:20 +0200 Subject: [IMP] mail: css: removed dead CSS code; pre is now displayed using the regular fonts. bzr revid: tde@openerp.com-20120907150820-kw3c5vj99mcpffzg --- addons/mail/static/src/css/mail.css | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'addons/mail/static/src') diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 240627c9e6c..815f0ec92c4 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -322,11 +322,7 @@ text-decoration: none; } -.openerp .oe_mail_msg_subtitle { - margin: 0 0 .5em 0; -} -.openerp .oe_mail_msg_footer, -.openerp .oe_mail_msg_subtitle { +.openerp .oe_mail_msg_footer { color: #888; } @@ -340,12 +336,13 @@ text-align: justify; } -.openerp .oe_mail_msg_body span.oe_mail_msg_tail { - display: inline; +.openerp .oe_mail_msg_record_body pre { + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; + margin: 0px; } -.openerp .oe_mail_oe_bold { - font-weight: bold; +.openerp .oe_mail_msg_body span.oe_mail_msg_tail { + display: inline; } /* Read more/less link */ -- cgit v1.2.3 From 83fe265fbaf1ab728d678e56bd6a9c64eae236b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 7 Sep 2012 17:17:19 +0200 Subject: [FIX] mail.js: fixed issue with user avatars. bzr revid: tde@openerp.com-20120907151719-suopvkfbyzbb06ig --- addons/mail/static/src/js/mail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/mail/static/src') diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 20218a2bb88..cf9a98d17b6 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -473,7 +473,7 @@ openerp.mail = function(session) { }, display_user_avatar: function () { - var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.options.uid); + var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid); return this.$el.find('img.oe_mail_icon').attr('src', avatar); }, -- cgit v1.2.3 From 871cd8ce33ee51b0d9f4e25211da94d68f6b2466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 10 Sep 2012 10:32:00 +0200 Subject: [FIX] mail.js: fixed links to related record in chatter, model and res_id were incorrect. bzr revid: tde@openerp.com-20120910083200-iqq5m9l1jxghfpr9 --- addons/mail/static/src/xml/mail.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'addons/mail/static/src') diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index f6be765c603..66b82d5a36c 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -118,15 +118,14 @@
-
- +
    -
    • +
  • Reply
    • -- cgit v1.2.3 From a44699ca707afde741deec58d9e2e563d6b396c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 10 Sep 2012 10:36:24 +0200 Subject: [FIX] mail.js: RecordThread now really using message_ids field. bzr revid: tde@openerp.com-20120910083624-wjdaqruoe42x33cq --- addons/mail/static/src/js/mail.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/mail/static/src') diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index cf9a98d17b6..e8d8e25e684 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -585,6 +585,7 @@ openerp.mail = function(session) { var thread = new mail.Thread(self, { 'context': this.options.context, 'thread_level': this.options.thread_level, 'show_header_compose': true, + 'message_ids': this.get_value(), 'show_delete': true, 'composer': true }); this.thread_list.push(thread); return thread.appendTo(this.$el.find('div.oe_mail_recthread_main')); -- cgit v1.2.3