From 68f0b8bd173d4c4ca87063fe2efb135e3806cacb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 20 Oct 2014 15:54:37 +0530 Subject: [PATCH] [fix] generator caching --- frappe/handler.py | 1 - frappe/templates/pages/login.py | 1 - frappe/utils/jinja.py | 2 +- frappe/website/context.py | 3 +++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/handler.py b/frappe/handler.py index 265c5e0489..b9ed28f93c 100755 --- a/frappe/handler.py +++ b/frappe/handler.py @@ -21,7 +21,6 @@ def runserverobj(method, docs=None, dt=None, dn=None, arg=None, args=None): @frappe.whitelist(allow_guest=True) def logout(): frappe.local.login_manager.logout() - frappe.set_user("Guest") frappe.db.commit() @frappe.whitelist(allow_guest=True) diff --git a/frappe/templates/pages/login.py b/frappe/templates/pages/login.py index 5e59c0b926..2e7b536b43 100644 --- a/frappe/templates/pages/login.py +++ b/frappe/templates/pages/login.py @@ -169,7 +169,6 @@ def login_oauth_user(data, provider=None): success=False, http_status_code=403) frappe.local.login_manager.user = user - frappe.set_user(user) frappe.local.login_manager.post_login() # redirect! diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index dc7d1976d4..e69fa24684 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -56,7 +56,7 @@ def get_allowed_functions_for_jenv(): "get_doc": frappe.get_doc, "get_list": frappe.get_list, "utils": datautils, - "user": frappe.session.user, + "user": frappe.local.session.user, "date_format": frappe.db.get_default("date_format") or "yyyy-mm-dd", "get_gravatar": frappe.utils.get_gravatar }, diff --git a/frappe/website/context.py b/frappe/website/context.py index 83cfd70945..52c32523ea 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -60,6 +60,9 @@ def build_context(sitemap_options): if ret: context.update(ret) + for prop in ("no_cache", "no_sitemap"): + context[prop] = getattr(context.doc, "no_cache", False) + elif context.controller: module = frappe.get_module(context.controller)