11.0 mail addons merge #235
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…annels 10.0 mail private add channels
10.0 mail to channels add
commit is created by 👷♂️ Merge Bot: https://odoo-devops.readthedocs.io/en/latest/git/github-merge-bot.html
itpp-bot
reviewed
Oct 11, 2019
There was a problem hiding this comment.
└─ .travis.yml
4 installable modules are updated:
├─ mail_base/
| ├─ README.rst
| ├─ __init__.py
| ├─ __manifest__.py
| ├─ controllers/
| | └─ main.py
| ├─ doc/
| | └─ changelog.rst
| ├─ models.py
| └─ static/
| └─ lib/
| └─ base.js
├─ mail_multi_website/
| ├─ README.rst
| ├─ __manifest__.py
| ├─ doc/
| | └─ index.rst
| └─ static/
| └─ description/
| └─ index.html
├─ mail_private/
| ├─ __init__.py
| ├─ __manifest__.py
| ├─ doc/
| | └─ changelog.rst
| ├─ full_composer_wizard.xml
| ├─ i18n/
| | └─ mail_private.pot
| ├─ models.py
| ├─ static/
| | └─ src/
| | ├─ css/
| | | └─ mail_private.css
| | ├─ js/
| | | └─ mail_private.js
| | └─ xml/
| | └─ mail_private.xml
| ├─ template.xml
| └─ tests/
| ├─ __init__.py
| └─ test_js.py
└─ mail_to/
├─ __init__.py
├─ __manifest__.py
├─ doc/
| └─ changelog.rst
├─ i18n/
| └─ mail_to.pot
├─ models/
| ├─ __init__.py
| └─ mail_message.py
├─ static/
| └─ src/
| ├─ js/
| | ├─ mail_to.js
| | └─ test_mail_to.js
| └─ xml/
| └─ recipient.xml
├─ templates.xml
└─ tests/
├─ __init__.py
└─ test_default.py
Not installable modules remain unchanged.
sent by ✌️ Odoo Review Bot
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
Ommo73
force-pushed
the
11.0-mail_addons-merge2
branch
from
759380a to
e9e2bcb
Compare
Ramil-Mukhametzyanov
suggested changes
Oct 17, 2019
Ommo73
force-pushed
the
11.0-mail_addons-merge2
branch
from
e9e2bcb to
ddb1528
Compare
| @@ -94,16 +98,72 @@ Chatter.include({ | |||
| method: 'send_recepients_for_internal_message', | |||
| args: [[], self.context.default_model, follower_ids_domain] | |||
| }).then(function (res) { | |||
| return _.filter(res, function (obj) { | |||
| res['partners'] = _.filter(res['partners'], function (obj) { | |||
There was a problem hiding this comment.
['partners'] is better written in dot notation.
| @@ -29,7 +30,8 @@ Chatter.include({ | |||
| this.fetch_recipients_for_internal_message().then(function (data) { | |||
| self._openComposer({ | |||
| is_private: true, | |||
| suggested_partners: data | |||
| suggested_partners: data['partners'], | |||
| suggested_channels: data['channels'], | |||
There was a problem hiding this comment.
['channels'] is better written in dot notation.
| @@ -29,7 +30,8 @@ Chatter.include({ | |||
| this.fetch_recipients_for_internal_message().then(function (data) { | |||
| self._openComposer({ | |||
| is_private: true, | |||
| suggested_partners: data | |||
| suggested_partners: data['partners'], | |||
There was a problem hiding this comment.
['partners'] is better written in dot notation.
| }, | ||
|
|
||
| get_internal_users_ids: function () { | ||
| var ResUser = new Model('mail.compose.message'); |
| return typeof channel !== 'undefined'; | ||
| }); | ||
|
|
||
| return new Model('mail.channel').call( |
| self.customer = thread[0].partner_id; | ||
|
|
||
| // Fetch channels ids | ||
| return new Model('mail.followers').call( |
| get_channels_for_internal_message: function () { | ||
| var self = this; | ||
| self.result = {}; | ||
| return new Model(this.context.default_model).query( |
| @@ -94,16 +98,72 @@ Chatter.include({ | |||
| method: 'send_recepients_for_internal_message', | |||
| args: [[], self.context.default_model, follower_ids_domain] | |||
| }).then(function (res) { | |||
| return _.filter(res, function (obj) { | |||
| res['partners'] = _.filter(res['partners'], function (obj) { | |||
There was a problem hiding this comment.
["partners"] is better written in dot notation dot-notation
| @@ -29,7 +30,8 @@ Chatter.include({ | |||
| this.fetch_recipients_for_internal_message().then(function (data) { | |||
| self._openComposer({ | |||
| is_private: true, | |||
| suggested_partners: data | |||
| suggested_partners: data['partners'], | |||
| suggested_channels: data['channels'], | |||
There was a problem hiding this comment.
["channels"] is better written in dot notation dot-notation
| @@ -29,7 +30,8 @@ Chatter.include({ | |||
| this.fetch_recipients_for_internal_message().then(function (data) { | |||
| self._openComposer({ | |||
| is_private: true, | |||
| suggested_partners: data | |||
| suggested_partners: data['partners'], | |||
There was a problem hiding this comment.
["partners"] is better written in dot notation dot-notation
Ommo73
force-pushed
the
11.0-mail_addons-merge2
branch
4 times, most recently
from
9087999 to
ef604da
Compare
yelizariev
approved these changes
Oct 21, 2019
| get_channels_for_internal_message: function () { | ||
| var self = this; | ||
| self.result = {}; | ||
| return new Model(this.context.default_model).query( |
There was a problem hiding this comment.
this is suspicious, obsolete function for v11
There was a problem hiding this comment.
@KolushovAlexandr Yep! You're right. I fixed it
Ommo73
force-pushed
the
11.0-mail_addons-merge2
branch
from
ef604da to
57a9758
Compare
Ramil-Mukhametzyanov
approved these changes
Oct 22, 2019
| `1.2.0` | ||
| ------- | ||
|
|
||
| - **New**: added ability to select channels for private message sending. |
| @@ -1,3 +1,7 @@ | |||
| `1.1.0` | |||
| ------- | |||
| - **New**: added ability to select channels for private message sending. | |||
| `1.2.0` | ||
| ------- | ||
|
|
||
| - **New**: added ability to select channels for private message sending. |
| `1.1.0` | ||
| ------- | ||
|
|
||
| - **New**: channels are displayed in recipients |
em230418
reviewed
Oct 23, 2019
mail_to/doc/changelog.rst
Outdated
| `1.0.1` | ||
| ------- | ||
|
|
||
| - **FIX:** The problem with duplicating the names of recipients was solved. | ||
| - **FIX**: the problem with duplicating the names of recipients was solved. |
em230418
suggested changes
Oct 23, 2019
Ommo73
force-pushed
the
11.0-mail_addons-merge2
branch
from
57a9758 to
fd6e85b
Compare
|
======== Testing test_flake8 ======== mail_private/models.py:62:9: F841 local variable 'group_user' is assigned to but never used |
Ommo73
force-pushed
the
11.0-mail_addons-merge2
branch
from
fd6e85b to
8a1aee2
Compare
Ommo73
force-pushed
the
11.0-mail_addons-merge2
branch
from
8a1aee2 to
1914b4a
Compare
|
вливайте без меня |
em230418
approved these changes
Oct 25, 2019
|
I approve to merge it now |
|
Approved by @em230418
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.