From 57e517cee968be4f53298dc7c402979ca6f83bd6 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Tue, 25 Feb 2014 15:44:07 +0530
Subject: [PATCH] Fixes in data import and login

---
 frappe/core/page/data_import_tool/data_import_tool.py | 4 ++--
 frappe/templates/includes/login.js                    | 2 +-
 frappe/utils/datautils.py                             | 2 +-
 frappe/website/js/website.js                          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/core/page/data_import_tool/data_import_tool.py b/frappe/core/page/data_import_tool/data_import_tool.py
index b6c7963813..e1bcb4d9b2 100644
--- a/frappe/core/page/data_import_tool/data_import_tool.py
+++ b/frappe/core/page/data_import_tool/data_import_tool.py
@@ -176,7 +176,7 @@ def get_template(doctype=None, parent_doctype=None, all_doctypes="No", with_data
 			frappe.permissions.can_export(parent_doctype, raise_exception=True)
 			
 			# get permitted data only
-			data = reportview.execute(doctype, fields="*")
+			data = reportview.execute(doctype, fields=["*"], limit_page_length=None)
 			for doc in data:
 				# add main table
 				row_group = []
@@ -512,7 +512,7 @@ def export_json(doctype, name, path):
 				del d["parent"]
 				del d["name"]
 			d["__islocal"] = 1
-		outfile.write(json.dumps(doclist, default=json_handler, indent=1, sort_keys=True))
+		outfile.write(json.dumps([doclist], default=json_handler, indent=1, sort_keys=True))
 
 def import_doclist(path, overwrite=False, ignore_links=False, ignore_insert=False, insert=False):
 	import os
diff --git a/frappe/templates/includes/login.js b/frappe/templates/includes/login.js
index e3d9186e91..f81db639b6 100644
--- a/frappe/templates/includes/login.js
+++ b/frappe/templates/includes/login.js
@@ -97,7 +97,7 @@ login.login_handlers = {
 			} else {
 				window.location.href = "/index";
 			}
-		} else if(window.is_sign_up) {
+		} else if(["#signup", "#forgot"].indexOf(window.location.hash)!==-1) {
 			frappe.msgprint(data.message);
 		}			
 	},
diff --git a/frappe/utils/datautils.py b/frappe/utils/datautils.py
index 804577169c..688d185124 100644
--- a/frappe/utils/datautils.py
+++ b/frappe/utils/datautils.py
@@ -11,7 +11,7 @@ from frappe.utils import encode, cstr, cint, flt
 def read_csv_content_from_uploaded_file(ignore_encoding=False):
 	if getattr(frappe, "uploaded_file", None):
 		with open(frappe.uploaded_file, "r") as upfile:
-			fcontent = upfile
+			fcontent = upfile.read()
 	else:
 		from frappe.utils.file_manager import get_uploaded_content
 		fname, fcontent = get_uploaded_content()
diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index f292204703..e6a2af0ff0 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -36,10 +36,10 @@ $.extend(frappe, {
 			dataType: "json",
 			statusCode: {
 				404: function(xhr) {
-					msgprint("Not Found");
+					frappe.msgprint("Not Found");
 				},
 				403: function(xhr) {
-					msgprint("Not Permitted");
+					frappe.msgprint("Not Permitted");
 				},
 				200: function(data, xhr) {
 					if(opts.callback)