Merge branch 'develop'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.0.5"
+__version__ = "6.0.6"

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"""

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"
 

frappe/public/js/frappe/desk.js

@@ -22,6 +22,7 @@ frappe.Application = Class.extend({
 		this.startup();
 	},
 	startup: function() {
+		frappe.socket.init();
 		frappe.model.init();
 		this.load_bootinfo();
 		this.make_nav_bar();

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);
 		});
@@ -119,8 +125,6 @@ frappe.socket = {
 	}
 }
 
-$(frappe.socket.init);
-
 frappe.provide("frappe.realtime");
 frappe.realtime.on = function(event, callback) {
 	frappe.socket.socket.on(event, callback);

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])

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()

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];
     }