From 70556493a0a87535f2f85f4bf2afca996aaef69b Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Wed, 4 Sep 2013 10:54:31 +0530 Subject: [PATCH] [minor] return login page if no app or no home page in app --- webnotes/webutils.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/webnotes/webutils.py b/webnotes/webutils.py index 907cd34fc2..8debe0ed2f 100644 --- a/webnotes/webutils.py +++ b/webnotes/webutils.py @@ -117,8 +117,18 @@ def get_standard_pages(): return webnotes.get_config()["web"]["pages"].keys() def prepare_args(page_name): + + has_app = True + try: + from startup.webutils import update_template_args, get_home_page + except ImportError: + has_app = False + if page_name == 'index': - page_name = get_home_page() + if has_app: + page_name = get_home_page() + else: + page_name = "login" pages = get_page_settings() @@ -136,7 +146,9 @@ def prepare_args(page_name): bean = webnotes.bean(page_info["args_doctype"]) bean.run_method("onload") args.obj = bean.make_controller() - + + if has_app: + update_template_args(page_name, args) else: args = get_doc_fields(page_name) @@ -144,11 +156,6 @@ def prepare_args(page_name): if not args: return False - try: - from startup.webutils import update_template_args - update_template_args(page_name, args) - except ImportError: - pass return args