From 8c41204877369c585c81fe30a658feaa700c350b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 21 Aug 2015 16:29:31 +0530 Subject: [PATCH 1/6] [socket] fail if unable to connect --- frappe/public/js/frappe/socket.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frappe/public/js/frappe/socket.js b/frappe/public/js/frappe/socket.js index 1158756826..141774edc7 100644 --- a/frappe/public/js/frappe/socket.js +++ b/frappe/public/js/frappe/socket.js @@ -7,6 +7,12 @@ frappe.socket = { } frappe.socket.socket = io.connect(frappe.socket.get_host()); + + if (!frappe.socket.socket) { + console.log("Unable to connect to " + frappe.socket.get_host()); + return; + } + frappe.socket.socket.on('msgprint', function(message) { frappe.msgprint(message); }); From c6317148bc9398dcaa577f8e22d456cbada32f44 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 21 Aug 2015 16:36:33 +0530 Subject: [PATCH 2/6] [fix] move socket init inside app init --- frappe/public/js/frappe/desk.js | 1 + frappe/public/js/frappe/socket.js | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index c8bb23c884..0b537bbf34 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -23,6 +23,7 @@ frappe.Application = Class.extend({ }, startup: function() { frappe.model.init(); + frappe.socket.init(); this.load_bootinfo(); this.make_nav_bar(); this.set_favicon(); diff --git a/frappe/public/js/frappe/socket.js b/frappe/public/js/frappe/socket.js index 141774edc7..511cf28e68 100644 --- a/frappe/public/js/frappe/socket.js +++ b/frappe/public/js/frappe/socket.js @@ -125,8 +125,6 @@ frappe.socket = { } } -$(frappe.socket.init); - frappe.provide("frappe.realtime"); frappe.realtime.on = function(event, callback) { frappe.socket.socket.on(event, callback); From b39c9a5318720c406ee8f2eeb3fd3c916367a0be Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 21 Aug 2015 17:06:09 +0530 Subject: [PATCH 3/6] [fix] move socket init inside app init --- frappe/public/js/frappe/desk.js | 2 +- socketio.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 0b537bbf34..6d2b00d83b 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -22,8 +22,8 @@ frappe.Application = Class.extend({ this.startup(); }, startup: function() { - frappe.model.init(); frappe.socket.init(); + frappe.model.init(); this.load_bootinfo(); this.make_nav_bar(); this.set_favicon(); diff --git a/socketio.js b/socketio.js index 88ba1c4dcf..da672ad14b 100644 --- a/socketio.js +++ b/socketio.js @@ -131,6 +131,7 @@ function get_site_name(socket) { } function get_hostname(url) { + if (!url) return undefined; if (url.indexOf("://") > -1) { url = url.split('/')[2]; } From 7d8f2eeaa128604d6cae1e2532438c984d3de8a9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 21 Aug 2015 17:47:56 +0530 Subject: [PATCH 4/6] [fix] Removed async temporarily from importer --- frappe/core/page/data_import_tool/importer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index 8947d29032..765c4f0869 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -15,7 +15,8 @@ from frappe.utils.dateutils import parse_date from frappe.utils import cint, cstr, flt from frappe.core.page.data_import_tool.data_import_tool import get_data_keys -@frappe.async.handler +# @frappe.async.handler +@frappe.whitelist() def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, overwrite=None, ignore_links=False, pre_process=None): """upload data""" From df5f27bee0f7d31431f445212c93343125ce68b9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 21 Aug 2015 18:00:26 +0530 Subject: [PATCH 5/6] [fix] Fixed test case due to removal of async from data import tool --- frappe/tests/test_data_import.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/tests/test_data_import.py b/frappe/tests/test_data_import.py index 256fc15244..af7cc4fc15 100644 --- a/frappe/tests/test_data_import.py +++ b/frappe/tests/test_data_import.py @@ -35,7 +35,7 @@ class TestDataImport(unittest.TestCase): exporter.get_template("Blog Category", all_doctypes="No", with_data="No") content = read_csv_content(frappe.response.result) content.append(["", "", "test-category", "Test Cateogry"]) - importer.upload.queue(content) + importer.upload(content) self.assertTrue(frappe.db.get_value("Blog Category", "test-category", "title"), "Test Category") # export with data @@ -44,7 +44,7 @@ class TestDataImport(unittest.TestCase): # overwrite content[-1][3] = "New Title" - importer.upload.queue(content, overwrite=True) + importer.upload(content, overwrite=True) self.assertTrue(frappe.db.get_value("Blog Category", "test-category", "title"), "New Title") def test_import_only_children(self): @@ -57,7 +57,7 @@ class TestDataImport(unittest.TestCase): exporter.get_template("UserRole", "User", all_doctypes="No", with_data="No") content = read_csv_content(frappe.response.result) content.append(["", "test_import_userrole@example.com", "Blogger"]) - importer.upload.queue(content) + importer.upload(content) user = frappe.get_doc("User", user_email) self.assertEquals(len(user.get("user_roles")), 1) @@ -67,7 +67,7 @@ class TestDataImport(unittest.TestCase): exporter.get_template("UserRole", "User", all_doctypes="No", with_data="No") content = read_csv_content(frappe.response.result) content.append(["", "test_import_userrole@example.com", "Website Manager"]) - importer.upload.queue(content, overwrite=True) + importer.upload(content, overwrite=True) user = frappe.get_doc("User", user_email) self.assertEquals(len(user.get("user_roles")), 1) @@ -81,7 +81,7 @@ class TestDataImport(unittest.TestCase): content[-1][3] = "Private" content[-1][4] = "2014-01-01 10:00:00.000000" content[-1][content[15].index("role")] = "System Manager" - importer.upload.queue(content) + importer.upload(content) ev = frappe.get_doc("Event", {"subject":"__Test Event"}) self.assertTrue("System Manager" in [d.role for d in ev.roles]) From 7274ba4b00feadac9d5748883ce9f1bdd99c85d7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 21 Aug 2015 18:42:56 +0600 Subject: [PATCH 6/6] bumped to version 6.0.6 --- 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 c9f6a927ec..eaa562a143 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.0.5" +__version__ = "6.0.6" diff --git a/frappe/hooks.py b/frappe/hooks.py index 5071213656..b46cb83ee4 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -26,7 +26,7 @@ to ERPNext. """ app_icon = "octicon octicon-circuit-board" -app_version = "6.0.5" +app_version = "6.0.6" app_color = "orange" github_link = "https://github.com/frappe/frappe" diff --git a/setup.py b/setup.py index 2082d05864..4d962532b4 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "6.0.5" +version = "6.0.6" with open("requirements.txt", "r") as f: install_requires = f.readlines()