瀏覽代碼

[fix] frappe.get_user

version-14
Rushabh Mehta 10 年之前
父節點
當前提交
ce0ce35501
共有 1 個檔案被更改,包括 6 行新增2 行删除
  1. +6
    -2
      frappe/__init__.py

+ 6
- 2
frappe/__init__.py 查看文件

@@ -263,7 +263,6 @@ def set_user(username):
"""Set current user. """Set current user.


:param username: **User** name to set as current user.""" :param username: **User** name to set as current user."""
from frappe.utils.user import User
local.session.user = username local.session.user = username
local.session.sid = username local.session.sid = username
local.cache = {} local.cache = {}
@@ -275,6 +274,7 @@ def set_user(username):
local.new_doc_templates = {} local.new_doc_templates = {}


def get_user(): def get_user():
from frappe.utils.user import User
if not local.user_obj: if not local.user_obj:
local.user_obj = User(local.session.user) local.user_obj = User(local.session.user)
return local.user_obj return local.user_obj
@@ -284,7 +284,11 @@ def get_roles(username=None):
if not local.session: if not local.session:
return ["Guest"] return ["Guest"]


return get_user(username).get_roles()
if username:
import frappe.utils.user
return frappe.utils.user.get_roles(username)
else:
return get_user().get_roles()


def get_request_header(key, default=None): def get_request_header(key, default=None):
"""Return HTTP request header. """Return HTTP request header.


Loading…
取消
儲存