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

Merge pull request #12765 from frappe/mergify/bp/version-13-pre-release/pr-12764

Browse source 
fix: users currently viewing a form (bp #12764)
This commit is contained in:
Suraj Shetty 2021-04-01 15:53:16 +05:30 • committed by GitHub
commit 30704b2c17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/public/js/frappe/form/form_viewers.js
View file

@ -6,11 +6,10 @@ frappe.ui.form.FormViewers = class FormViewers {
}
refresh() {
// REDESIGN-TODO: fix this
// let users = this.frm.get_docinfo()['viewers'];
// let currently_viewing = users.current.filter(user => user != frappe.session.user);
// let avatar_group = frappe.avatar_group(currently_viewing, 5, {'align': 'left', 'overlap': true});
this.parent.empty(); //.append(avatar_group);
let users = this.frm.get_docinfo()['viewers'];
let currently_viewing = users.current.filter(user => user != frappe.session.user);
let avatar_group = frappe.avatar_group(currently_viewing, 5, {'align': 'left', 'overlap': true});
this.parent.empty().append(avatar_group);
}
};

5
frappe/public/js/frappe/form/toolbar.js
View file

@ -210,7 +210,10 @@ frappe.ui.form.Toolbar = class Toolbar {
}
make_viewers() {
if (this.frm.viewers) return;
if (this.frm.viewers) {
this.frm.viewers.parent.empty();
return;
}
this.frm.viewers = new frappe.ui.form.FormViewers({
frm: this.frm,
parent: $('<div class="form-viewers d-flex"></div>').prependTo(this.frm.page.page_actions)

4
frappe/public/js/frappe/socketio_client.js
View file

@ -159,8 +159,8 @@ frappe.socketio = {
},
doc_open: function(doctype, docname) {
// notify that the user has opened this doc, if not already notified
if(!frappe.socketio.last_doc
|| (frappe.socketio.last_doc[0]!=doctype && frappe.socketio.last_doc[1]!=docname)) {
if (!frappe.socketio.last_doc
|| (frappe.socketio.last_doc[0] != doctype || frappe.socketio.last_doc[1] != docname)) {
frappe.socketio.socket.emit('doc_open', doctype, docname);
}
frappe.socketio.last_doc = [doctype, docname];