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

Merge pull request #1363 from saurabh6790/supp_2610

Browse source 
[fixes] apply permissions specified in DocShare
This commit is contained in:
Nabin Hait 2015-10-27 11:19:58 +05:30
commit 0c4df29be2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/permissions.py
View file

@ -145,9 +145,9 @@ def update_share_permissions(role_permissions, doc, user):
if permissions_by_share:
for ptype in share_ptypes:
if ptype:
if permissions_by_share[ptype]:
role_permissions[ptype] = 1
def get_role_permissions(meta, user=None, verbose=False):
"""Returns dict of evaluated role permissions like `{"read": True, "write":False}`

2
frappe/public/js/frappe/model/perm.js
View file

@ -76,7 +76,7 @@ $.extend(frappe.perm, {
// apply permissions from shared
if(docinfo.shared) {
for(var i=0; i<docinfo.shared; i++) {
for(var i=0; i<docinfo.shared.length; i++) {
var s = docinfo.shared[i];
if(s.user===user) {
perm[0]["read"] = perm[0]["read"] || s.read;