10.0 mail private add channels #182

Ommo73 · 2019-03-19T14:10:46Z

Added ability to select channels for private message sending

mail_private/static/src/js/mail_private.js

mail_private/models.py

mail_private/static/src/js/mail_private.js

yelizariev

My comments from #183 (review) can be applied here too

Ommo73 · 2019-03-22T13:05:59Z

My comments from #183 (review) can be applied here too

I corrected it

KolushovAlexandr · 2019-03-22T23:26:30Z

mail_base/__manifest__.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
+# Copyright 2018 Ruslan Ronzhin <https://it-projects.info/team/rusllan/>


Find all contributors

I added other authors

KolushovAlexandr · 2019-03-22T23:26:53Z

mail_base/doc/changelog.rst

@@ -1,3 +1,7 @@
+`1.1.5`


KolushovAlexandr · 2019-03-22T23:29:38Z

mail_base/static/lib/base.js

@@ -1,3 +1,6 @@
+/*  Copyright 2018 Ruslan Ronzhin <https://it-projects.info/team/rusllan/>


copyrights are totally wrong

KolushovAlexandr · 2019-03-22T23:34:28Z

mail_private/__manifest__.py

 {
    "name": """Internal Messaging""",
    "summary": """Send private messages to specified recipients, regardless of who are in followers list.""",
    "category": "Discuss",
    "images": ['images/mail_private_image.png'],
-    "version": "10.0.1.0.1",
+    "version": "10.0.1.1.1",


KolushovAlexandr · 2019-03-22T23:36:45Z

mail_private/full_composer_wizard.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Copyright 2017 Artyom Losev <https://github.com/ArtyomLosev>
+    Copyright 2018 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
+    Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>


Why did you set yourself here if there are no any changes by you?

KolushovAlexandr · 2019-03-23T00:29:15Z

mail_base/static/lib/base.js

+    get_checked_channels_ids: function () {
+        var self = this;
+        var checked_channels = [];
+        this.$('.o_composer_suggested_partners:eq(1) input:checked').each(function() {


Rename or add a new class/id. It confuses, the method is about channels, but we looking through the partners

KolushovAlexandr · 2019-03-23T00:57:40Z

mail_base/static/lib/base.js

+            // for module mail_private
+            if (self.options.is_private) {
+                message.context.is_private = true;
+                message.context.channel_ids = self.get_checked_channels_ids();


Try to find a way to do it like for partner_ids, not via context.

KolushovAlexandr · 2019-03-23T01:06:23Z

mail_base/static/lib/base.js

@@ -177,6 +181,12 @@ var MailComposer = composer.BasicComposer.extend({
                message.subtype = 'mail.mt_note';
            }

+            // for module mail_private
+            if (self.options.is_private) {


Not sure that it's needed here. Is there any reason for that? In 12v I remember was a function that redefines values to a new object without is_private attribute.

Is there any way to avoid updating mail_base?

KolushovAlexandr · 2019-03-23T01:07:37Z

mail_private/models.py

+        # TDE CHECK: add partners / channels as arguments to be able to notify a message with / without computation ??
+        self.ensure_one()  # tde: not sure, just for testinh, will see
+        partners = self.env['res.partner'] | self.partner_ids
+        channels = self.env['mail.channel'].search([('id', '=', self._context['channel_ids'])])


use 'browse' not search.

KolushovAlexandr · 2019-03-23T01:10:02Z

mail_private/models.py

+
+        # TDE CHECK: add partners / channels as arguments to be able to notify a message with / without computation ??
+        self.ensure_one()  # tde: not sure, just for testinh, will see
+        partners = self.env['res.partner'] | self.partner_ids


Don't understand this construction because
self.env['res.partner'] | self.partner_ids = self.partner_ids

Could someone explain?

I can guess that self.partner_ids may be undefined.

Empty self.partner_ids is the same as self.env['res.partner'].
Was this code copy-paster from odoo? If so, one can try to make a PR that fix this

@yelizariev yes this code copy-paster from odoo

KolushovAlexandr · 2019-03-24T00:03:25Z

mail_private/models.py

+
+    @api.multi
+    def _notify_mail_private(self, force_send=False, send_after_commit=True, user_signature=True):
+        """ Add the related record followers to the destination partner_ids if is not a private message.


also, instead of this comment, it will be good to write a comment that the method was copy-pasted from odoo and describe the difference from the origin (and show where the code was changed)

mail_private/static/src/js/mail_private.js

mail_private/models.py

hound · 2019-04-26T11:56:07Z

mail_private/static/src/js/mail_private.js


+        if (options && options.is_private) {
+            self.internal_users_ids = options.internal_ids


Missing semicolon.

hound · 2019-04-26T11:56:07Z

mail_private/static/src/js/mail_private.js


+        if (options && options.is_private) {
+            self.internal_users_ids = options.internal_ids


Missing semicolon semi

KolushovAlexandr · 2019-05-08T11:48:23Z

mail_private/models.py

+                'parent_id': parent_id,
+                'subtype_id': subtype_id,
+                'partner_ids': [(4, pid) for pid in partner_ids],
+                'channel_ids': [(4, pid) for pid in kwargs['channel_ids']]


Update kwargs at first and then call the super with updated kwargs. No need for copy-paste here

kwargs['channel_ids'] = [(4, pid) for pid in kwargs['channel_ids']]
super(MailThread, self).message_post(idk, kwargs)

hound · 2019-05-13T11:18:24Z

mail_private/models.py

+        kwargs['channel_ids'] = [(4, pid) for pid in kwargs['channel_ids']]
+        return super(MailThread, self).message_post(body, subject, message_type,
+                                             subtype, parent_id, attachments,
+                                             content_subtype, **kwargs)


continuation line under-indented for visual indent

hound · 2019-05-13T11:18:24Z

mail_private/models.py

+                     content_subtype='html', **kwargs):
+        kwargs['channel_ids'] = [(4, pid) for pid in kwargs['channel_ids']]
+        return super(MailThread, self).message_post(body, subject, message_type,
+                                             subtype, parent_id, attachments,


continuation line under-indented for visual indent

hound · 2019-05-13T11:18:24Z

mail_private/models.py

+# Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>
+# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html).
+
+from odoo import models, fields, api, exceptions, _, tools


'odoo._' imported but unused
'odoo.exceptions' imported but unused
'odoo.tools' imported but unused

KolushovAlexandr · 2019-05-13T13:43:44Z

mail_private/static/src/js/mail_private.js

@@ -52,13 +65,14 @@ Chatter.include({
    open_composer: function (options) {
        var self = this;
        this._super.apply(this, arguments);
-        if (options && options.is_private) {



Artem, keep the commit history clean. Each PR you give me to check has this kind of problems. Use git diff and check sent code here. 3 places need to be changed in this PR.

KolushovAlexandr · 2019-05-13T13:44:32Z

mail_private/static/src/js/mail_private.js

            this.composer.options.is_private = options.is_private;

            _.each(self.recipients_for_internal_message, function (partner) {
                self.composer.suggested_partners.push({
-                    checked: (partner.user_ids.length > 0),
+                    checked: (self.internal_users_ids.indexOf(partner.user_ids[0]) !== -1),


and again, why do you check only the first id? There might be several of them

KolushovAlexandr · 2019-05-13T13:57:30Z

mail_private/static/src/js/mail_private.js

+
+                // Fetch partner ids
+                return new Model('mail.followers').call(
+                    'read', [follower_ids, ['channel_id']]).then(function (res_partners) {


it's about channels, not partners. Update all variable names in the function

KolushovAlexandr · 2019-05-13T14:01:28Z

mail_private/static/src/js/mail_private.js

+            }
+
+            // for module mail_private
+            if (self.options.is_private) {


you can do it without a total method redefinition

hound · 2019-05-14T08:39:02Z

mail_private/static/src/js/mail_private.js

            this.composer.options.is_private = options.is_private;

            _.each(self.recipients_for_internal_message, function (partner) {
                self.composer.suggested_partners.push({
-                    checked: (partner.user_ids.length > 0),
+                    checked: (self.internal_users_ids.some(r=> partner.user_ids.includes(r))),


'arrow function syntax (=>)' is only available in ES6 (use 'esversion: 6').

hound · 2019-05-14T08:39:02Z

mail_private/static/src/js/mail_private.js

            this.composer.options.is_private = options.is_private;

            _.each(self.recipients_for_internal_message, function (partner) {
                self.composer.suggested_partners.push({
-                    checked: (partner.user_ids.length > 0),
+                    checked: (self.internal_users_ids.some(r=> partner.user_ids.includes(r))),


Expected parentheses around arrow function argument arrow-parens

hound · 2019-05-15T11:34:30Z

mail_private/static/src/js/mail_private.js

+        if (self.options.is_private) {
+            self.context.is_private = true;
+        }
+        return this._super()


Missing semicolon.

hound · 2019-05-15T11:34:30Z

mail_private/static/src/js/mail_private.js

+        if (self.options.is_private) {
+            self.context.is_private = true;
+        }
+        return this._super()


Missing semicolon semi

Ramil-Mukhametzyanov

Change the button name to "Add Channels" in the pop-up window

Ramil-Mukhametzyanov

If a message is sent to a task follower via "Send internal message" (for example, from demo to admin), it is noted in the task discussion, rather than being sent.
An error occurred when admin clicked "Send internal message" in this example, but it has not been reproduced.

Ommo73 · 2019-05-21T08:06:20Z

Change the button name to "Add Channels" in the pop-up window

This part of the interface does not apply to our module.

Ramil-Mukhametzyanov · 2019-06-04T06:46:44Z

If a message is sent to a task follower via "Send internal message" (for example, from demo to admin), it is noted in the task discussion, rather than being sent.
An error occurred when admin clicked "Send internal message" in this example, but it has not been reproduced.

Ramil-Mukhametzyanov · 2019-06-04T06:50:15Z

If a message is sent to a task follower via "Send internal message" (for example, from demo to admin), it is noted in the task discussion, rather than being sent.
This part works the same way in current module version. It's OK.

An error occurred when admin clicked "Send internal message" in this example, but it has not been reproduced.
The error rises when the button is double clicked. It's also OK.

Ramil-Mukhametzyanov

Messages sent to a channel via "Send internal message" do not appear on the Discuss dashboard.
And even messages sent via "New message" don't appear there after that if the page is not reloaded.

hound · 2019-06-13T17:13:33Z

mail_private/static/src/js/mail_private.js

+            });
+        });
+        return checked_channels;
+    },


Expected an assignment or function call and instead saw an expression.
Expected an identifier and instead saw ','.
Missing semicolon.

hound · 2019-06-13T17:13:33Z

mail_private/static/src/js/mail_private.js

+            return this.users_ids;
+    },
+
+    get_checked_channels_ids: function () {


Label 'get_checked_channels_ids' on function statement.
Missing name in function declaration.

hound · 2019-06-13T17:13:33Z

mail_private/static/src/js/mail_private.js

+                return users_ids;
+            });
+            return this.users_ids;
+    },


Expected an assignment or function call and instead saw an expression.
Expected an identifier and instead saw ','.
Missing semicolon.

hound · 2019-06-13T17:13:33Z

mail_private/static/src/js/mail_private.js

+        });
+    },
+
+    get_internal_users_ids: function () {


Label 'get_internal_users_ids' on function statement.
Missing name in function declaration.

hound · 2019-06-13T17:13:33Z

mail_private/static/src/js/mail_private.js

+                                });
+                    });
+        });
+    },


Expected an assignment or function call and instead saw an expression.
Expected an identifier and instead saw ','.
Missing semicolon.

hound · 2019-06-13T17:13:33Z

mail_private/static/src/js/mail_private.js

-    }
+    },
+
+    get_channels_for_internal_message: function () {


Label 'get_channels_for_internal_message' on function statement.
Missing name in function declaration.

hound · 2019-06-13T17:13:33Z

mail_private/static/src/js/mail_private.js

@@ -101,20 +124,86 @@ Chatter.include({
                                });
                    });
        });
-    }
+    },


Expected an assignment or function call and instead saw an expression.
Expected an identifier and instead saw ','.
Missing semicolon.

hound · 2019-06-13T17:13:33Z

mail_private/static/src/js/mail_private.js

@@ -33,32 +41,38 @@ Chatter.include({
            }).fail(function () {
                // todo: display notification
            });
-        },
+    },


Expected an assignment or function call and instead saw an expression.
Expected an identifier and instead saw ','.
Missing semicolon.

yelizariev

Why there are two commits with the same message?

Ommo73 · 2019-07-30T06:02:43Z

Why there are two commits with the same message?

It's because mail_private module refers to the mail_base module. I add one new function that is in the commit message, but changes occur in two modules.

yelizariev · 2019-07-31T07:42:56Z

Fix this lint please:

mail_base/models.py:19: [W0622(redefined-builtin), MailMessage.write] Redefining built-in 'id'

yelizariev · 2019-07-31T08:35:12Z

It seems that Agrolait user is selected automatically, while he is not Internal Users

… sending

…age sending

yelizariev · 2019-08-11T07:31:06Z

I approve to merge it now

itpp-bot · 2019-08-11T07:31:10Z

Approved by @yelizariev

hound bot reviewed Mar 19, 2019

View reviewed changes

mail_private/static/src/js/mail_private.js Outdated Show resolved Hide resolved

mail_private/models.py Outdated Show resolved Hide resolved

mail_private/models.py Show resolved Hide resolved

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from 1c48b2e to 44f0d3c Compare March 20, 2019 10:10

hound bot reviewed Mar 20, 2019

View reviewed changes

mail_private/static/src/js/mail_private.js Outdated Show resolved Hide resolved

Ommo73 force-pushed the 10.0-mail_private-add_channels branch 4 times, most recently from aa38c5a to f8a26ed Compare March 21, 2019 18:37

yelizariev requested changes Mar 21, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from f8a26ed to a6896a8 Compare March 22, 2019 12:33

KolushovAlexandr suggested changes Mar 23, 2019

View reviewed changes

KolushovAlexandr reviewed Mar 24, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch 2 times, most recently from 124fd91 to 36e573a Compare March 29, 2019 06:49

hound bot reviewed Mar 29, 2019

View reviewed changes

mail_private/static/src/js/mail_private.js Outdated Show resolved Hide resolved

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from 36e573a to 4655aa6 Compare April 1, 2019 10:40

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from 4655aa6 to add565a Compare April 25, 2019 11:45

hound bot reviewed Apr 25, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch 2 times, most recently from 3650cc7 to 41bc443 Compare April 26, 2019 11:55

hound bot reviewed Apr 26, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from 41bc443 to 1696029 Compare April 26, 2019 12:54

KolushovAlexandr suggested changes May 8, 2019

View reviewed changes

hound bot reviewed May 13, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch 2 times, most recently from 5dca30f to cc93723 Compare May 13, 2019 12:35

KolushovAlexandr suggested changes May 13, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch 2 times, most recently from 1004659 to ef59080 Compare May 14, 2019 08:38

hound bot reviewed May 14, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch 4 times, most recently from b8db881 to 00a0127 Compare May 15, 2019 11:34

hound bot reviewed May 15, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from 00a0127 to b45f5b7 Compare May 15, 2019 11:35

KolushovAlexandr approved these changes May 15, 2019

View reviewed changes

Ramil-Mukhametzyanov suggested changes May 20, 2019

View reviewed changes

Ramil-Mukhametzyanov closed this Jun 4, 2019

Ramil-Mukhametzyanov reopened this Jun 4, 2019

Ramil-Mukhametzyanov suggested changes Jun 4, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from b6082ce to d9cd643 Compare June 13, 2019 17:13

hound bot reviewed Jun 13, 2019

View reviewed changes

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from d9cd643 to 843c7dd Compare July 17, 2019 13:28

Ramil-Mukhametzyanov approved these changes Jul 18, 2019

View reviewed changes

yelizariev requested changes Jul 18, 2019

View reviewed changes

Ommo73 added 2 commits August 2, 2019 18:39

⚡ mail_base New: added ability to select channels for private message…

3e3ab4c

… sending

⚡ mail_private New: added ability to select channels for private mess…

1ccc657

…age sending

Ommo73 force-pushed the 10.0-mail_private-add_channels branch from 843c7dd to 1ccc657 Compare August 2, 2019 13:42

Merge branch '10.0' into 10.0-mail_private-add_channels

c045b3d

itpp-bot merged commit 5a610a4 into itpp-labs:10.0 Aug 11, 2019

		@@ -1,10 +1,13 @@
		# -- coding: utf-8 --
		# Copyright 2018 Ruslan Ronzhin <https://it-projects.info/team/rusllan/>

		@@ -1,3 +1,6 @@
		/* Copyright 2018 Ruslan Ronzhin <https://it-projects.info/team/rusllan/>


		if (options && options.is_private) {
		self.internal_users_ids = options.internal_ids

@@ @@ -101,20 +124,86 @@ Chatter.include({ @@
                                               });
                                   });
                       });
-                  }
+                  },

10.0 mail private add channels #182

10.0 mail private add channels #182

Conversation

Ommo73 commented Mar 19, 2019

yelizariev left a comment

Choose a reason for hiding this comment

Ommo73 commented Mar 22, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hound bot Apr 26, 2019

Choose a reason for hiding this comment

hound bot Apr 26, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hound bot May 13, 2019

Choose a reason for hiding this comment

hound bot May 13, 2019

Choose a reason for hiding this comment

hound bot May 13, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hound bot May 14, 2019

Choose a reason for hiding this comment

hound bot May 14, 2019

Choose a reason for hiding this comment

hound bot May 15, 2019

Choose a reason for hiding this comment

hound bot May 15, 2019

Choose a reason for hiding this comment

Ramil-Mukhametzyanov left a comment

Choose a reason for hiding this comment

Ramil-Mukhametzyanov left a comment

Choose a reason for hiding this comment

Ommo73 commented May 21, 2019

Ramil-Mukhametzyanov commented Jun 4, 2019

Ramil-Mukhametzyanov commented Jun 4, 2019

Ramil-Mukhametzyanov left a comment

Choose a reason for hiding this comment

hound bot Jun 13, 2019

Choose a reason for hiding this comment

hound bot Jun 13, 2019

Choose a reason for hiding this comment

hound bot Jun 13, 2019

Choose a reason for hiding this comment

hound bot Jun 13, 2019

Choose a reason for hiding this comment

hound bot Jun 13, 2019

Choose a reason for hiding this comment

hound bot Jun 13, 2019

Choose a reason for hiding this comment

hound bot Jun 13, 2019

Choose a reason for hiding this comment

hound bot Jun 13, 2019

Choose a reason for hiding this comment

yelizariev left a comment

Choose a reason for hiding this comment

Ommo73 commented Jul 30, 2019

yelizariev commented Jul 31, 2019

yelizariev commented Jul 31, 2019

yelizariev commented Aug 11, 2019

itpp-bot commented Aug 11, 2019