From e2155ae540d8881c0ca9b2055db60bc8ed053021 Mon Sep 17 00:00:00 2001 From: "Priket Trivedi (OpenERP Trainee)" Date: Tue, 16 Jul 2013 14:22:31 +0530 Subject: [PATCH 1/7] [IMP] mail in add class to set margin and change pixel for filed bzr revid: trivedi.pariket@gmail.com-20130716085231-8qe107fvcm6rwmj4 --- addons/mail/static/src/css/mail.css | 3 +++ addons/mail/wizard/mail_compose_message_view.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 211133afaf8..a0c60e548b6 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -53,6 +53,9 @@ .openerp .oe_mail > .oe_thread{ margin-left: 0px; } +.openerp .oe_inline.oe_compose_recipients { + margin-top: -2px; +} /* ---------------- MESSAGES ------------------ */ diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 1ca07b6a94c..2b29d774e77 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -31,7 +31,7 @@ attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}"> Followers of - + and Date: Tue, 16 Jul 2013 17:41:24 +0800 Subject: [PATCH 2/7] [IMP] change a reply private discussion Document in chatter and remove a author notified of its own messages bzr revid: mehulmehta008@gmail.com-20130716094124-ksigo91x3njgdj4f --- addons/mail/static/src/xml/mail.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 94ee1ff452f..318a0f5860a 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -121,21 +121,23 @@ To: - + Followers of My Followers Followers of this document - and - - - - - + + and + + + + + + , others... From 5d4f89f9d67b24446c5c88174bc6d61051599adb Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 23 Jul 2013 11:19:26 +0530 Subject: [PATCH 3/7] [IMP]: check is_author condition bzr revid: atp@tinyerp.com-20130723054926-4t0whshbgcrkql3h --- addons/mail/static/src/xml/mail.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 318a0f5860a..b14b5a5d3ce 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -128,10 +128,10 @@ Followers of this document + and - - and + @@ -139,6 +139,7 @@ + , others... <<< From 48c68c3a997a2bc1d32bd6aeb6a47a03cf0eb924 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 23 Jul 2013 11:25:11 +0530 Subject: [PATCH 4/7] [FIX]: Fix private message partnerid problem and display and when no author bzr revid: atp@tinyerp.com-20130723055511-edtutz2au78rcinx --- addons/mail/static/src/js/mail.js | 1 + addons/mail/static/src/xml/mail.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 5d54a6acc48..1715b7b0368 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -1235,6 +1235,7 @@ openerp.mail = function (session) { this.last_id = datasets.last_id || false; this.parent_id = datasets.parent_id || false; this.is_private = datasets.is_private || false; + this.is_author = datasets.is_author || false, this.author_id = datasets.author_id || false; this.thread_level = (datasets.thread_level+1) || 0; datasets.partner_ids = datasets.partner_ids || []; diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index b14b5a5d3ce..05a3b61d9f3 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -128,7 +128,7 @@ Followers of this document - and + and @@ -139,7 +139,7 @@ - + , others... <<< From 2706328ca43a02196bd1b4766d2e04718a8cf1ed Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Thu, 25 Jul 2013 12:49:39 +0530 Subject: [PATCH 5/7] [IMP] mail: Pass current user partner id into datasets and get it into template. add author also for private mail. bzr revid: atp@tinyerp.com-20130725071939-9lmuhfgte987nu03 --- addons/mail/mail_message.py | 1 + addons/mail/static/src/js/mail.js | 7 ++++--- addons/mail/static/src/xml/mail.xml | 7 +++---- addons/mail/wizard/mail_compose_message.py | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 9d6829f3f6e..df8ced65177 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -375,6 +375,7 @@ class mail_message(osv.Model): 'author_id': author, 'partner_ids': partner_ids, 'attachment_ids': attachment_ids, + 'user_pid': pid }) return True diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 1715b7b0368..b77aa7e111b 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -234,7 +234,7 @@ openerp.mail = function (session) { this.attachment_ids = datasets.attachment_ids || [], this.partner_ids = datasets.partner_ids || []; this.date = datasets.date; - + this.user_pid = datasets.user_pid || false; this.format_data(); // update record_name: Partner profile @@ -564,6 +564,7 @@ openerp.mail = function (session) { 'default_partner_ids': partner_ids, 'mail_post_autofollow': true, 'mail_post_autofollow_partner_ids': partner_ids, + 'is_private': self.is_private }; if (self.is_log) { _.extend(context, {'mail_compose_log': true}); @@ -772,7 +773,7 @@ openerp.mail = function (session) { // if clicked: call for suggested recipients if (event.type == 'click') { this.is_log = $input.hasClass('oe_compose_log'); - suggested_partners = this.parent_thread.ds_thread.call('message_get_suggested_recipients', [[this.context.default_res_id]]).done(function (additional_recipients) { + suggested_partners = this.parent_thread.ds_thread.call('message_get_suggested_recipients', [[this.context.default_res_id], this.context]).done(function (additional_recipients) { var thread_recipients = additional_recipients[self.context.default_res_id]; _.each(thread_recipients, function (recipient) { var parsed_email = mail.ChatterUtils.parse_email(recipient[1]); @@ -1242,9 +1243,9 @@ openerp.mail = function (session) { if (datasets.author_id && !_.contains(_.flatten(datasets.partner_ids),datasets.author_id[0]) && datasets.author_id[0]) { datasets.partner_ids.push(datasets.author_id); } + this.user_pid = datasets.user_pid || false; this.partner_ids = datasets.partner_ids; this.messages = []; - this.options.flat_mode = (this.options.display_indented_thread - this.thread_level > 0); // object compose message diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 05a3b61d9f3..147671514bc 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -128,18 +128,17 @@ Followers of this document - and - + + and - + - , others... <<< diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 7685a27f1ed..c2a491d59a8 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -66,14 +66,12 @@ class mail_compose_message(osv.TransientModel): if context is None: context = {} result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context) - # get some important values from context composition_mode = context.get('default_composition_mode', context.get('mail.compose.message.mode')) model = context.get('default_model', context.get('active_model')) res_id = context.get('default_res_id', context.get('active_id')) message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id'))) active_ids = context.get('active_ids') - # get default values according to the composition mode if composition_mode == 'reply': vals = self.get_message_data(cr, uid, message_id, context=context) @@ -206,7 +204,9 @@ class mail_compose_message(osv.TransientModel): # get partner_ids from original message partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else [] partner_ids += context.get('default_partner_ids', []) - + if context.get('is_private',False) and message_data.author_id : #check message is private then add author also in partner list. + partner_ids += [message_data.author_id.id] + # update the result result = { 'record_name': message_data.record_name, From 4468117ad524d5ee88edfd096bec88545c366f76 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Thu, 25 Jul 2013 13:02:49 +0530 Subject: [PATCH 6/7] [FIX] mail: remove is author unused assignment. bzr revid: atp@tinyerp.com-20130725073249-t1fvurzfdp0wh8j3 --- addons/mail/static/src/js/mail.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index b77aa7e111b..a901e77c842 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -1236,7 +1236,6 @@ openerp.mail = function (session) { this.last_id = datasets.last_id || false; this.parent_id = datasets.parent_id || false; this.is_private = datasets.is_private || false; - this.is_author = datasets.is_author || false, this.author_id = datasets.author_id || false; this.thread_level = (datasets.thread_level+1) || 0; datasets.partner_ids = datasets.partner_ids || []; From 7810f03c56a00952dd0b59f9e933532e21bea7af Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Thu, 25 Jul 2013 13:03:54 +0530 Subject: [PATCH 7/7] [REM]: Remove unused space bzr revid: atp@tinyerp.com-20130725073354-uq3b2r0io1wsbdku --- addons/mail/wizard/mail_compose_message.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index c2a491d59a8..0f0446dd731 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -206,7 +206,6 @@ class mail_compose_message(osv.TransientModel): partner_ids += context.get('default_partner_ids', []) if context.get('is_private',False) and message_data.author_id : #check message is private then add author also in partner list. partner_ids += [message_data.author_id.id] - # update the result result = { 'record_name': message_data.record_name,