From 2858118f917f0ca50c8f8ba7b931c9bdd7da84e9 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 13 Nov 2018 12:47:49 +0530 Subject: [PATCH 1/2] fix(chat): Setup and render chat on website pages as well --- frappe/website/js/website.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 5744ebd977..7fa29991d0 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -421,7 +421,9 @@ frappe.ready(function() { callback: (r) => { if (r.message) { frappe.require('/assets/js/moment-bundle.min.js', () => { - frappe.require('/assets/js/chat.js'); + frappe.require('/assets/js/chat.js', () => { + frappe.chat.setup(); + }); }); } } From 265d4501c6c7f0739d0dc274e2cc594f8b8be7bb Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 12 Nov 2018 22:41:11 +0530 Subject: [PATCH 2/2] fix(chat): Do not remove Chat Operators from Website Settings --- frappe/chat/doctype/chat_room/chat_room.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/chat/doctype/chat_room/chat_room.py b/frappe/chat/doctype/chat_room/chat_room.py index b6a9ee6e5c..4de234f89b 100644 --- a/frappe/chat/doctype/chat_room/chat_room.py +++ b/frappe/chat/doctype/chat_room/chat_room.py @@ -195,7 +195,10 @@ def create(kind, owner, users = None, name = None): for user in dsettings.chat_operators: if user.user not in users: - room.append('users', user) + # appending user to room.users will remove the user from chat_operators + # this is undesirable, create a new Chat Room User instead + chat_room_user = {"doctype": "Chat Room User", "user": user.user} + room.append('users', chat_room_user) room.save(ignore_permissions = True)