From 862a5a398dd26c1226102b7cd42f3fafbbc8cdae Mon Sep 17 00:00:00 2001 From: gavin Date: Thu, 17 Nov 2022 15:18:48 +0530 Subject: [PATCH] fix(socketio): Revert irrelevant & unused changes Co-authored-by: Ankush Menat --- frappe/desk/doctype/notification_log/notification_log.py | 2 +- frappe/public/js/frappe/model/model.js | 5 ----- frappe/public/js/frappe/socketio_client.js | 2 -- frappe/realtime.py | 3 --- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index 6367e0f45f..4d82932555 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -176,7 +176,7 @@ def mark_as_read(docname): @frappe.whitelist() def trigger_indicator_hide(): - frappe.publish_realtime("indicator_hide", user=frappe.session.user, after_commit=True) + frappe.publish_realtime("indicator_hide", user=frappe.session.user) def set_notifications_as_unseen(user): diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js index bcd6b297b2..99553f470c 100644 --- a/frappe/public/js/frappe/model/model.js +++ b/frappe/public/js/frappe/model/model.js @@ -79,10 +79,6 @@ $.extend(frappe.model, { init: function () { // setup refresh if the document is updated somewhere else - if (frappe.socketio.is_document_listener_setup) { - return; - } - frappe.realtime.on("doc_update", function (data) { var doc = locals[data.doctype] && locals[data.doctype][data.name]; @@ -108,7 +104,6 @@ $.extend(frappe.model, { } } }); - frappe.socketio.is_document_listener_setup = true; }, is_value_type: function (fieldtype) { diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js index d4f8fec87f..1ac875544c 100644 --- a/frappe/public/js/frappe/socketio_client.js +++ b/frappe/public/js/frappe/socketio_client.js @@ -3,8 +3,6 @@ frappe.socketio = { open_tasks: {}, open_docs: [], emit_queue: [], - is_docinfo_listener_setup: false, - is_document_listener_setup: false, init: function (port = 3000) { if (frappe.boot.disable_async) { diff --git a/frappe/realtime.py b/frappe/realtime.py index 1ab3a74238..68809c63f3 100644 --- a/frappe/realtime.py +++ b/frappe/realtime.py @@ -119,9 +119,6 @@ def can_subscribe_doc(doctype, docname): @frappe.whitelist(allow_guest=True) def can_subscribe_list(doctype): - if os.environ.get("CI"): - return True - from frappe.exceptions import PermissionError if not frappe.has_permission(user=frappe.session.user, doctype=doctype, ptype="read"):