From 77760db89c10132625417a31221abdc5e57413b5 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 15 Oct 2015 12:54:33 +0530 Subject: [PATCH] [fix] strip whitespace in setup wizard args --- .../setup/page/setup_wizard/setup_wizard.py | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py index 764dd780bc..742adc64b5 100644 --- a/erpnext/setup/page/setup_wizard/setup_wizard.py +++ b/erpnext/setup/page/setup_wizard/setup_wizard.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe, json, copy -from frappe.utils import cstr, flt, getdate +from frappe.utils import cstr, flt, getdate, strip from frappe import _ from frappe.utils.file_manager import save_file from frappe.translate import (set_default_language, get_dict, @@ -23,12 +23,7 @@ def setup_account(args=None): if frappe.db.sql("select name from tabCompany"): frappe.throw(_("Setup Already Complete!!")) - if not args: - args = frappe.local.form_dict - if isinstance(args, basestring): - args = json.loads(args) - - args = frappe._dict(args) + args = process_args(args) if args.language and args.language != "english": set_default_language(args.language) @@ -109,6 +104,21 @@ def setup_account(args=None): frappe.get_attr(hook)(args) +def process_args(args): + if not args: + args = frappe.local.form_dict + if isinstance(args, basestring): + args = json.loads(args) + + args = frappe._dict(args) + + # strip the whitespace + for key, value in args.items(): + if isinstance(value, basestring): + args[key] = strip(value) + + return args + def update_user_name(args): if args.get("email"): args['name'] = args.get("email")