12.0 mail addons merge #246
Open
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
For explanation see odoo/odoo@d7b7b07
…-channels-are-allowed 🚑 polling error on database concurrency error
…-add_channels ⚡ shows messages from channels
🛡️ services postgresql 10.0
🛡️ services postgresql 11.0
🛡️ postgres 10
🛡️ postgres 11
commit is created by 👷♂️ Merge Bot: https://odoo-devops.readthedocs.io/en/latest/git/github-merge-bot.html
commit is created by 👷♂️ Merge Bot: https://odoo-devops.readthedocs.io/en/latest/git/github-merge-bot.html
itpp-bot
reviewed
Oct 26, 2019
There was a problem hiding this comment.
6 installable modules are updated:
├─ mail_all/
| └─ i18n/
| ├─ mail_all.pot
| └─ sl.po
├─ mail_archives/
| └─ i18n/
| ├─ mail_archives.pot
| └─ sl.po
├─ mail_multi_website/
| └─ i18n/
| └─ mail_multi_website.pot
├─ mail_private/
| ├─ __manifest__.py
| ├─ doc/
| | └─ changelog.rst
| ├─ i18n/
| | ├─ de.po
| | ├─ it.po
| | └─ sl.po
| ├─ models.py
| ├─ static/
| | └─ src/
| | ├─ css/
| | | └─ mail_private.css
| | ├─ js/
| | | └─ mail_private.js
| | └─ xml/
| | └─ mail_private.xml
| └─ template.xml
├─ mail_sent/
| └─ i18n/
| └─ mail_sent.pot
└─ 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
| └─ xml/
| └─ recipient.xml
├─ templates.xml
└─ tests/
├─ __init__.py
└─ test_default.py
7 not installable modules s are updated:
├─ mail_base/
| ├─ README.rst
| ├─ __init__.py
| ├─ __manifest__.py
| ├─ controllers/
| | └─ main.py
| ├─ doc/
| | └─ changelog.rst
| ├─ i18n/
| | ├─ de.po
| | ├─ es.po
| | ├─ it.po
| | ├─ mail_base.pot
| | ├─ pt.po
| | ├─ pt_BR.po
| | ├─ ru.po
| | └─ sl.po
| ├─ models.py
| └─ static/
| └─ lib/
| └─ base.js
├─ mail_move_message/
| ├─ __manifest__.py
| ├─ controllers/
| | └─ main.py
| ├─ doc/
| | └─ changelog.rst
| ├─ i18n/
| | ├─ de.po
| | └─ mail_move_message.pot
| └─ mail_move_message_models.py
├─ mail_recovery/
| └─ i18n/
| └─ mail_recovery.pot
├─ mail_reply/
| └─ i18n/
| ├─ es.po
| └─ mail_reply.pot
├─ mailgun/
| └─ i18n/
| ├─ es.po
| └─ mailgun.pot
├─ res_partner_company_messages/
| └─ i18n/
| ├─ de.po
| ├─ es.po
| ├─ res_partner_company_messages.pot
| └─ ru.po
└─ res_partner_mails_count/
└─ i18n/
├─ de.po
├─ es.po
├─ res_partner_mails_count.pot
└─ ru.po
sent by ✌️ Odoo Review Bot
| ------- | ||
|
|
||
| - **New**: added ability to select channels for private message sending. | ||
|
|
|
|
||
| - **New**: Channels are displayed in recipients | ||
|
|
||
|
|
em230418
reviewed
Nov 7, 2019
em230418
reviewed
Nov 7, 2019
Ommo73
force-pushed
the
12.0-mail_addons-merge
branch
6 times, most recently
from
e5e841b to
63d358c
Compare
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
| @@ -29,7 +38,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
Ramil-Mukhametzyanov
approved these changes
Dec 26, 2019
Ommo73
force-pushed
the
12.0-mail_addons-merge
branch
from
63d358c to
2df5ddb
Compare
| @@ -98,16 +110,18 @@ 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 +38,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 +38,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.
| Thread.include({ | ||
| _postMessage: function (data) { | ||
| return this._super.apply(this, arguments).then(function (messageData) { | ||
| messageData['channel_ids'] = data['channel_ids']; |
There was a problem hiding this comment.
['channel_ids'] is better written in dot notation.
| @@ -98,16 +110,18 @@ 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 +38,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
em230418
suggested changes
Jan 13, 2020
There was a problem hiding this comment.
Тут линтер жалуется: https://github.com/it-projects-llc/mail-addons/pull/246/files#diff-225d6c8a499a123363386ecc5c22bad2
Других замечаний по коду нет.
|
Есть ли понимание какие обновления нужно перенести в 12? Я пока только это выделил: #295 |
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.