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

Merge pull request #19422 from gavindsouza/rename-socketio-events

Browse source 
fix(socketio): Event list_update > doctype_subscribe
This commit is contained in:
Ritwik Puri 2022-12-29 14:02:21 +05:30 • committed by GitHub
commit db0baa2da3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/list/list_view.js
View file

@ -1321,7 +1321,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
if (this.list_view_settings && this.list_view_settings.disable_auto_refresh) {
return;
}
frappe.socketio.list_subscribe(this.doctype);
frappe.socketio.doctype_subscribe(this.doctype);
frappe.realtime.on("list_update", (data) => {
if (!frappe.get_doc(data?.doctype, data?.name)?.__unsaved) {
frappe.model.remove_from_locals(data.doctype, data.name);

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

@ -129,8 +129,8 @@ frappe.socketio = {
task_unsubscribe: function (task_id) {
frappe.socketio.socket.emit("task_unsubscribe", task_id);
},
list_subscribe: function (doctype) {
frappe.socketio.socket.emit("list_update", doctype);
doctype_subscribe: function (doctype) {
frappe.socketio.socket.emit("doctype_subscribe", doctype);
},
doc_subscribe: function (doctype, docname) {
if (frappe.flags.doc_subscribe) {

2
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -56,7 +56,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
if (this.list_view_settings?.disable_auto_refresh) {
return;
}
frappe.socketio.list_subscribe(this.doctype);
frappe.socketio.doctype_subscribe(this.doctype);
frappe.realtime.on("list_update", (data) => this.on_update(data));
}

2
frappe/realtime.py
View file

@ -115,7 +115,7 @@ def can_subscribe_doc(doctype: str, docname: str) -> bool:
@frappe.whitelist(allow_guest=True)
def can_subscribe_list(doctype: str) -> bool:
def can_subscribe_doctype(doctype: str) -> bool:
from frappe.exceptions import PermissionError
if not frappe.has_permission(user=frappe.session.user, doctype=doctype, ptype="read"):

10
socketio.js
View file

@ -58,8 +58,8 @@ io.on("connection", function (socket) {
socket.join(get_site_room(socket));
}
socket.on("list_update", function (doctype) {
can_subscribe_list({
socket.on("doctype_subscribe", function (doctype) {
can_subscribe_doctype({
socket,
doctype,
callback: () => {
@ -286,11 +286,11 @@ function can_subscribe_doc(args) {
});
}
function can_subscribe_list(args) {
function can_subscribe_doctype(args) {
if (!args) return;
if (!args.doctype) return;
request
.get(get_url(args.socket, "/api/method/frappe.realtime.can_subscribe_list"))
.get(get_url(args.socket, "/api/method/frappe.realtime.can_subscribe_doctype"))
.type("form")
.query({
sid: args.socket.sid,
@ -306,7 +306,7 @@ function can_subscribe_list(args) {
args.callback && args.callback(err, res);
return true;
}
log("ERROR (can_subscribe_list): ", err, res);
log("ERROR (can_subscribe_doctype): ", err, res);
});
}