From 7edb191661f7e9b0395c788f216ee016ee0bc0d6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 24 Jun 2013 12:11:15 +0530 Subject: [PATCH] [complete setup] [usability] refresh after success --- public/js/complete_setup.js | 17 +++++++++++------ setup/doctype/setup_control/setup_control.py | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/public/js/complete_setup.js b/public/js/complete_setup.js index f0b21c8516f..37c2fba52e5 100644 --- a/public/js/complete_setup.js +++ b/public/js/complete_setup.js @@ -75,12 +75,17 @@ $.extend(erpnext.complete_setup, { if(!data) return; $(this).set_working(); $c_obj('Setup Control','setup_account',data,function(r, rt){ - sys_defaults = r.message; - user_fullname = r.message.user_fullname; - wn.boot.user_info[user].fullname = user_fullname; - d.hide(); - $('header').toggle(true); - wn.container.wntoolbar.set_user_name(); + if(!r.exc) { + sys_defaults = r.message; + user_fullname = r.message.user_fullname; + wn.boot.user_info[user].fullname = user_fullname; + d.hide(); + $('header').toggle(true); + wn.container.wntoolbar.set_user_name(); + + setTimeout(function() { window.location.reload(); }, 3000); + } + }); }; diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py index 5bfe4a7d94b..bf8b87f3ad7 100644 --- a/setup/doctype/setup_control/setup_control.py +++ b/setup/doctype/setup_control/setup_control.py @@ -97,7 +97,7 @@ class DocType: self.create_email_digest() webnotes.clear_cache() - msgprint("Company setup is complete. Please refresh the page before continuing.") + msgprint("Company setup is complete. This page will be refreshed in a moment.") import webnotes.utils user_fullname = (args.get('first_name') or '') + (args.get('last_name')