From 862f181ae2397e2803e04eaea2f86d9ecbfc8dfe Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 18 Jan 2013 14:48:40 +0530 Subject: [PATCH] fix in get defaults as list --- webnotes/__init__.py | 4 ++-- webnotes/db.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webnotes/__init__.py b/webnotes/__init__.py index e75ec18921..353128d8ee 100644 --- a/webnotes/__init__.py +++ b/webnotes/__init__.py @@ -275,7 +275,7 @@ def has_permission(doctype, ptype="read", doc=None): and ifnull(p.permlevel,0) = 0 and (p.role="All" or p.role in (select `role` from tabUserRole where `parent`=%s)) """ % ("%s", ptype, "%s"), (doctype, session.user), as_dict=1) - + if doc: match_failed = {} for p in perms: @@ -284,7 +284,7 @@ def has_permission(doctype, ptype="read", doc=None): keys = p.match.split(":") else: keys = [p.match, p.match] - + if doc.fields.get(keys[0],"[No Value]") \ in conn.get_defaults_as_list(keys[1], session.user): return True diff --git a/webnotes/db.py b/webnotes/db.py index 83dd4beca3..dd5d080322 100644 --- a/webnotes/db.py +++ b/webnotes/db.py @@ -329,7 +329,7 @@ class Database: def get_defaults_as_list(self, key, parent="Control Panel"): ret = [r[0] for r in self.sql("""select defvalue from \ tabDefaultValue where defkey=%s and parent=%s""", (key, parent))] - if key=="owner" and webnotes.session: + if key in ["owner", "user"] and webnotes.session: ret.append(webnotes.session.user) return ret