vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #6452 from adityahase/website-chat

Browse source 
[Fix] Website Chat
This commit is contained in:
Faris Ansari 2018-11-13 23:27:33 +05:30 • committed by GitHub
commit fc663d7b5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/chat/doctype/chat_room/chat_room.py
View file

@ -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)

4
frappe/website/js/website.js
View file

@ -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();
});
});
}
}