瀏覽代碼

Merge branch 'master' into develop

version-14
mbauskar 8 年之前
父節點
當前提交
6454281841
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/core/doctype/report/report.py
  3. +1
    -1
      frappe/public/js/frappe/ui/base_list.js

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

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

__version__ = '8.2.3'
__version__ = '8.2.4'
__title__ = "Frappe Framework"

local = Local()


+ 1
- 1
frappe/core/doctype/report/report.py 查看文件

@@ -49,7 +49,7 @@ class Report(Document):
delete_custom_role('report', self.name)

def set_doctype_roles(self):
if not self.get('roles'):
if not self.get('roles') and self.is_standard == 'No':
meta = frappe.get_meta(self.ref_doctype)
roles = [{'role': d.role} for d in meta.permissions if d.permlevel==0]
self.set('roles', roles)


+ 1
- 1
frappe/public/js/frappe/ui/base_list.js 查看文件

@@ -193,7 +193,7 @@ frappe.ui.BaseList = Class.extend({
});

this.meta.fields.forEach(function(df) {
if(df.in_standard_filter) {
if(df.in_standard_filter && !frappe.model.no_value_type.includes(df.fieldtype)) {
if(df.fieldtype == "Select" && df.options) {
var options = df.options.split("\n")
if(options.length > 0 && options[0] != ""){


Loading…
取消
儲存