diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-04-25 14:43:44 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-04-25 14:43:44 +0200 |
| commit | bb8f0f1fc3d0f5574938019ca69cc917a55e7962 (patch) | |
| tree | a6662094bb9c307981461fdb9872195032f2da06 /addons/mail/static/src/js/chat_manager.js | |
| parent | 9ad6a9df6e5e5654bc98c4c655848404b4e946b2 (diff) | |
| parent | 4d337f72ed59d1e5260fa2bb4f3d238e6ed11415 (diff) | |
[MERGE] forward port of branch saas-9 up to 4d337f7
Diffstat (limited to 'addons/mail/static/src/js/chat_manager.js')
| -rw-r--r-- | addons/mail/static/src/js/chat_manager.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index 80c758bc335..ab9f88826dd 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -260,10 +260,8 @@ function make_channel (data, options) { messages: [], }}, }; - if (channel.type === "channel" && data.public !== "private") { - channel.type = "public"; - } else if (data.public === "private") { - channel.type = "private"; + if (channel.type === "channel") { + channel.type = data.public !== "private" ? "public" : "private"; } if (_.size(data.direct_partner) > 0) { channel.type = "dm"; |