From a8d3e51a0524a0eb814f4199ddbcfca4753deaeb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 23 Dec 2015 16:42:47 +0530 Subject: [PATCH 1/2] [minor] fix. Don't subscribe doc-open when new, via Error Snapshot --- frappe/public/js/frappe/socketio_client.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js index f67934a3be..931d4bd0c3 100644 --- a/frappe/public/js/frappe/socketio_client.js +++ b/frappe/public/js/frappe/socketio_client.js @@ -43,15 +43,27 @@ frappe.socket = { }); $(document).on("form_refresh", function(e, frm) { + if (frm.is_new()) { + return; + } + frappe.socket.doc_open(frm.doctype, frm.docname); }); $(document).on('form-unload', function(e, frm) { + if (frm.is_new()) { + return; + } + // frappe.socket.doc_unsubscribe(frm.doctype, frm.docname); frappe.socket.doc_close(frm.doctype, frm.docname); }); window.onbeforeunload = function() { + if (frm.is_new()) { + return; + } + // if tab/window is closed, notify other users if (cur_frm && cur_frm.doc) { frappe.socket.doc_close(cur_frm.doctype, cur_frm.docname); From 83b493ab85953b1a2280aafc8703851f95af9d22 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 23 Dec 2015 17:13:55 +0600 Subject: [PATCH 2/2] bumped to version 6.15.4 --- frappe/__version__.py | 2 +- frappe/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__version__.py b/frappe/__version__.py index 67ee59c79c..be6507d833 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.15.3" +__version__ = "6.15.4" diff --git a/frappe/hooks.py b/frappe/hooks.py index 9f4c5bce7b..bfd57e9c24 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd." app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node" app_icon = "octicon octicon-circuit-board" -app_version = "6.15.3" +app_version = "6.15.4" app_color = "orange" source_link = "https://github.com/frappe/frappe" app_license = "MIT" diff --git a/setup.py b/setup.py index 19bcec6a17..a0ffb1d211 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements -version = "6.15.3" +version = "6.15.4" requirements = parse_requirements("requirements.txt", session="") setup(