瀏覽代碼

Merge pull request #1149 from nabinhait/develop

[perms] allow email/print if has read access via share
version-14
Nabin Hait 10 年之前
父節點
當前提交
72c3d28f10
共有 2 個檔案被更改,包括 7 行新增4 行删除
  1. +6
    -3
      frappe/permissions.py
  2. +1
    -1
      frappe/public/js/frappe/model/perm.js

+ 6
- 3
frappe/permissions.py 查看文件

@@ -39,13 +39,16 @@ def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None):
return True

def false_if_not_shared():
if ptype in ("read", "write", "share"):
shared = frappe.share.get_shared(doctype, user, [ptype])
if ptype in ("read", "write", "share", "email", "print"):
shared = frappe.share.get_shared(doctype, user,
["read" if ptype in ("email", "print") else ptype])
if doc:
doc_name = doc if isinstance(doc, basestring) else doc.name
if doc_name in shared:
if verbose: print "Shared"
return True
if ptype in ("read", "write", "share") or meta.permissions[0].get(ptype):
return True
else:
if verbose: print "Has a shared document"
return True


+ 1
- 1
frappe/public/js/frappe/model/perm.js 查看文件

@@ -69,7 +69,7 @@ $.extend(frappe.perm, {
perm[0]["write"] = s.write;
perm[0]["share"] = s.share;

if(s.write) {
if(s.read) {
// also give print, email permissions if read
// and these permissions exist at level [0]
perm[0].email = meta.permissions[0].email;


Loading…
取消
儲存