vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1568 from anandpdoshi/fix/controller-permissions

Browse source 
[fix] has_controller_permissions - return None if function could not decide on True or False
This commit is contained in:
Anand Doshi 2016-02-16 14:23:21 +05:30
commit feb258daed
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/core/doctype/user/user.py
View file

@ -510,9 +510,6 @@ def has_permission(doc, user):
# dont allow non Administrator user to view / edit Administrator user
return False
else:
return True
def notifify_admin_access_to_system_manager(login_manager=None):
if (login_manager
and login_manager.user == "Administrator"

8
frappe/permissions.py
View file

@ -294,10 +294,12 @@ def has_controller_permissions(doc, ptype, user=None):
return None
for method in methods:
if not frappe.call(frappe.get_attr(method), doc=doc, ptype=ptype, user=user):
return False
controller_permission = frappe.call(frappe.get_attr(method), doc=doc, ptype=ptype, user=user)
if controller_permission is not None:
return controller_permission
return True
# controller permissions could not decide on True or False
return None
def can_set_user_permissions(doctype, docname=None):
# System Manager can always set user permissions