Merge pull request #6700 from Kratos-Freyja/develop

fix: Users list doctype with Postgres
This commit is contained in:
Suraj Shetty 2019-01-09 10:05:52 +05:30 committed by GitHub
commit bd7dce75c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -891,10 +891,9 @@ def get_active_website_users():
def get_permission_query_conditions(user):
if user=="Administrator":
return ""
else:
return """(`tabUser`.name not in ({standard_users}))""".format(
standard_users='"' + '", "'.join(STANDARD_USERS) + '"')
standard_users = ", ".join(frappe.db.escape(user) for user in STANDARD_USERS))
def has_permission(doc, user):
if (user != "Administrator") and (doc.name in STANDARD_USERS):