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

Merged develop into v5

Browse source
This commit is contained in:
Nabin Hait 2015-03-17 10:57:01 +05:30
commit e6358065ba
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/__version__.py
View file

@ -1,3 +1,2 @@
from __future__ import unicode_literals
__version__ = "5.0.0-alpha"

23
frappe/permissions.py
View file

@ -61,9 +61,9 @@ def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None):
if role_permissions["apply_user_permissions"].get(ptype):
if not user_has_permission(doc, verbose=verbose, user=user,
user_permission_doctypes=role_permissions.get("user_permission_doctypes")):
if verbose: print "No user permission"
return false_if_not_shared()
user_permission_doctypes=role_permissions.get("user_permission_doctypes", {}).get(ptype) or []):
if verbose: print "No user permission"
return false_if_not_shared()
if not has_controller_permissions(doc, ptype, user=user):
if verbose: print "No controller permission"
@ -88,11 +88,11 @@ def get_doc_permissions(doc, verbose=False, user=None):
if not cint(meta.allow_import):
role_permissions["import"] = 0
if role_permissions.get("apply_user_permissions") and not user_has_permission(doc, verbose=verbose, user=user,
user_permission_doctypes=role_permissions.get("user_permission_doctypes")):
if role_permissions.get("apply_user_permissions"):
# no user permissions, switch off all user-level permissions
for ptype in role_permissions:
if role_permissions["apply_user_permissions"].get(ptype):
if role_permissions["apply_user_permissions"].get(ptype) and not user_has_permission(doc, verbose=verbose, user=user,
user_permission_doctypes=role_permissions.get("user_permission_doctypes", {}).get(ptype) or []):
role_permissions[ptype] = 0
# update share permissions
@ -107,7 +107,7 @@ def get_role_permissions(meta, user=None):
cache_key = (meta.name, user)
if not frappe.local.role_permissions.get(cache_key):
perms = frappe._dict({ "apply_user_permissions": {} })
perms = frappe._dict({ "apply_user_permissions": {}, "user_permission_doctypes": {} })
user_roles = frappe.get_roles(user)
for p in meta.permissions:
@ -124,9 +124,11 @@ def get_role_permissions(meta, user=None):
user_permission_doctypes = (json.loads(p.user_permission_doctypes)
if p.user_permission_doctypes else None)
if user_permission_doctypes and user_permission_doctypes not in perms.get("user_permission_doctypes", []):
# perms["user_permission_doctypes"] would be a list of list like [["User", "Blog Post"], ["User"]]
perms.setdefault("user_permission_doctypes", []).append(user_permission_doctypes)
if user_permission_doctypes:
# perms["user_permission_doctypes"][ptype] would be a list of list like [["User", "Blog Post"], ["User"]]
for ptype in rights:
if p.get(ptype):
perms["user_permission_doctypes"].setdefault(ptype, []).append(user_permission_doctypes)
for key, value in perms.get("apply_user_permissions").items():
if not value:
@ -255,7 +257,6 @@ def get_user_permission_doctypes(user_permission_doctypes, user_permissions):
else:
user_permission_doctypes = [user_permissions.keys()]
if len(user_permission_doctypes) > 1:
# OPTIMIZATION
# if intersection exists, use that to reduce the amount of querying

9
frappe/public/js/frappe/misc/utils.js
View file

@ -239,6 +239,15 @@ frappe.utils = {
return arr;
},
all: function(lst) {
for(var i=0, l=lst.length; i<l; i++) {
if(!lst[i]) {
return false;
}
}
return true;
},
dict: function(keys,values) {
// make dictionaries from keys and values
var out = [];