-
-
Notifications
You must be signed in to change notification settings - Fork 190
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
12.0 mail addons merge #246
base: 12.0
Are you sure you want to change the base?
Conversation
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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. | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
|
||
- **New**: Channels are displayed in recipients | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
e5e841b
to
63d358c
Compare
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
["partners"] is better written in dot notation dot-notation
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
['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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
['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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
['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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
['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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
["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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
["channels"] is better written in dot notation dot-notation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Тут линтер жалуется: https://github.com/it-projects-llc/mail-addons/pull/246/files#diff-225d6c8a499a123363386ecc5c22bad2
Других замечаний по коду нет.
Есть ли понимание какие обновления нужно перенести в 12? Я пока только это выделил: #295 |
No description provided.