浏览代码

Merge branch 'develop'

version-14
Nabin Hait 9 年前
父节点
当前提交
7e75d69a5b
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. +1
    -1
      frappe/__init__.py
  2. +3
    -3
      frappe/model/document.py

+ 1
- 1
frappe/__init__.py 查看文件

@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template from .utils.jinja import get_jenv, get_template, render_template


__version__ = "7.0.17"
__version__ = "7.0.18"


local = Local() local = Local()




+ 3
- 3
frappe/model/document.py 查看文件

@@ -424,12 +424,12 @@ class Document(BaseDocument):
has_access_to = self.get_permlevel_access('read') has_access_to = self.get_permlevel_access('read')


for df in self.meta.fields: for df in self.meta.fields:
if not df.permlevel in has_access_to:
if df.permlevel and not df.permlevel in has_access_to:
self.set(df.fieldname, None) self.set(df.fieldname, None)


for table_field in self.meta.get_table_fields(): for table_field in self.meta.get_table_fields():
for df in frappe.get_meta(table_field.options):
if not df.permlevel in has_access_to:
for df in frappe.get_meta(table_field.options).fields or []:
if df.permlevel and not df.permlevel in has_access_to:
for child in self.get(table_field.fieldname) or []: for child in self.get(table_field.fieldname) or []:
child.set(df.fieldname, None) child.set(df.fieldname, None)




正在加载...
取消
保存