From 51fc20be5b15e437136e078dae43af31d1041eab Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 11 Jul 2012 18:56:13 +0530 Subject: [PATCH] fixes in index page logic --- erpnext/website/web_cache.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/website/web_cache.py b/erpnext/website/web_cache.py index 2221df3b22..3bd6ca7cc6 100644 --- a/erpnext/website/web_cache.py +++ b/erpnext/website/web_cache.py @@ -81,14 +81,14 @@ def load_into_web_cache(page_name, template, doc_type, doc_name): return html def prepare_args(page_name, doc_type, doc_name, with_outer_env=1): + if page_name == 'index': + page_name, doc_type, doc_name = get_index_page() + if page_name in ['404', 'blog', 'products', 'login-page']: args = { 'name': page_name, } else: - if page_name == 'index': - page_name, doc_type, doc_name = get_index_page() - from webnotes.model.code import get_obj obj = get_obj(doc_type, doc_name) if hasattr(obj, 'prepare_template_args'): @@ -129,6 +129,8 @@ def get_index_page(): doc_type = 'Web Page' doc_name = webnotes.conn.get_value('Website Settings', None, 'home_page') page_name = webnotes.conn.get_value(doc_type, doc_name, 'page_name') + if not page_name: + page_name = 'login-page' return page_name, doc_type, doc_name # cache management