summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/components/composer
diff options
context:
space:
mode:
authorDidier (did) <did@odoo.com>2020-09-21 15:44:21 +0000
committerSébastien Theys <seb@odoo.com>2020-09-21 16:49:47 +0000
commitde1f701e7bd7ebb6f7ebea5c097d980039c4f904 (patch)
treed4b931794a6200ebce8809ff73400d65dc391e56 /addons/mail/static/src/components/composer
parentaaec45b9aece17f8c764cd7a89eb243a5fc11924 (diff)
[FIX] mail: restore the "to followers" feature
Before this commit, the "to followers" message inside the chatter composer was missing. Fix also some padding issue. This also restore the form dialog when you try to send a message to a suggested recipient that doesn't have a partner (someone in CC email for eg). But now, suggested recipient without partner are unchecked by default and the form open when the user try to check them. If the user discard the form dialog, the suggested recipient isn't checked. This is better since only a partner will receive a notification. task-2280157 closes odoo/odoo#58160 X-original-commit: 67d151cc36871d87b92676357a31a70de5a92fce Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Diffstat (limited to 'addons/mail/static/src/components/composer')
-rw-r--r--addons/mail/static/src/components/composer/composer.js2
-rw-r--r--addons/mail/static/src/components/composer/composer.scss2
-rw-r--r--addons/mail/static/src/components/composer/composer.xml3
3 files changed, 5 insertions, 2 deletions
diff --git a/addons/mail/static/src/components/composer/composer.js b/addons/mail/static/src/components/composer/composer.js
index 510a5ac6038..bc46cd72d1d 100644
--- a/addons/mail/static/src/components/composer/composer.js
+++ b/addons/mail/static/src/components/composer/composer.js
@@ -3,6 +3,7 @@ odoo.define('mail/static/src/components/composer/composer.js', function (require
const components = {
AttachmentList: require('mail/static/src/components/attachment_list/attachment_list.js'),
+ ComposerSuggestedRecipientList: require('mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js'),
DropZone: require('mail/static/src/components/drop_zone/drop_zone.js'),
EmojisPopover: require('mail/static/src/components/emojis_popover/emojis_popover.js'),
FileUploader: require('mail/static/src/components/file_uploader/file_uploader.js'),
@@ -190,7 +191,6 @@ class Composer extends Component {
}
return;
}
- // TODO: take suggested recipients into account (task-2283356)
await this.composer.postMessage();
// TODO: we might need to remove trigger and use the store to wait for the post rpc to be done
// task-2252858
diff --git a/addons/mail/static/src/components/composer/composer.scss b/addons/mail/static/src/components/composer/composer.scss
index 7ba50371577..37250a2ffd7 100644
--- a/addons/mail/static/src/components/composer/composer.scss
+++ b/addons/mail/static/src/components/composer/composer.scss
@@ -13,7 +13,7 @@
&.o-has-current-partner-avatar {
grid-template-columns: 50px 1fr;
- padding: map-get($spacers, 0) map-get($spacers, 3) map-get($spacers, 1) map-get($spacers, 1);
+ padding: map-get($spacers, 3) map-get($spacers, 3) map-get($spacers, 4) map-get($spacers, 1);
&:not(.o-has-footer) {
padding-bottom: 20px;
diff --git a/addons/mail/static/src/components/composer/composer.xml b/addons/mail/static/src/components/composer/composer.xml
index 61694e5aaf1..be947b72b3f 100644
--- a/addons/mail/static/src/components/composer/composer.xml
+++ b/addons/mail/static/src/components/composer/composer.xml
@@ -46,6 +46,9 @@
</t>
</b>
</small>
+ <ComposerSuggestedRecipientList
+ threadLocalId="composer.thread.localId"
+ />
</t>
</div>
</t>