From 205b349880559ecdd1dbdb8c259eb2d4e6891e89 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 27 Jun 2016 18:12:54 +0530
Subject: [PATCH] [minor] move add_sidebar_items to the top

---
 frappe/core/page/data_import_tool/importer.py | 4 ++--
 frappe/utils/__init__.py                      | 2 +-
 frappe/website/context.py                     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py
index 8d63103591..94ce67d325 100644
--- a/frappe/core/page/data_import_tool/importer.py
+++ b/frappe/core/page/data_import_tool/importer.py
@@ -21,7 +21,7 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 	ignore_links=False, pre_process=None, via_console=False):
 	"""upload data"""
 	frappe.flags.mute_emails = True
-	frappe.flags.in_upload = True
+	frappe.flags.in_import = True
 
 	# extra input params
 	params = json.loads(frappe.form_dict.get("params") or '{}')
@@ -277,7 +277,7 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 		frappe.db.commit()
 
 	frappe.flags.mute_emails = False
-	frappe.flags.in_upload = False
+	frappe.flags.in_import = False
 
 	return {"messages": ret, "error": error}
 
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 8f1513725b..832b838117 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -120,7 +120,7 @@ def random_string(length):
 
 def has_gravatar(email):
 	'''Returns gravatar url if user has set an avatar at gravatar.com'''
-	if (frappe.flags.in_upload
+	if (frappe.flags.in_import
 		or frappe.flags.in_install
 		or frappe.flags.in_test):
 		# no gravatar if via upload
diff --git a/frappe/website/context.py b/frappe/website/context.py
index 24257ebacb..60ffe2ce43 100644
--- a/frappe/website/context.py
+++ b/frappe/website/context.py
@@ -43,6 +43,9 @@ def build_context(context):
 	context.update(get_website_settings())
 	context.update(frappe.local.conf.get("website_context") or {})
 
+	if context.show_sidebar:
+		add_sidebar_data(context)
+
 	# provide doc
 	if context.doc:
 		context.update(context.doc.as_dict())
@@ -75,9 +78,6 @@ def build_context(context):
 			if hasattr(module, "get_children"):
 				context.children = module.get_children(context)
 
-	if context.show_sidebar:
-		add_sidebar_data(context)
-
 	add_metatags(context)
 
 	# determine templates to be used