Browse Source

Merge branch 'hotfix'

version-14
mbauskar 8 years ago
parent
commit
fe60f8e559
3 changed files with 3 additions and 4 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/core/doctype/report/report.py
  3. +1
    -2
      frappe/public/js/frappe/ui/base_list.js

+ 1
- 1
frappe/__init__.py View File

@@ -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 View File

@@ -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
- 2
frappe/public/js/frappe/ui/base_list.js View File

@@ -192,9 +192,8 @@ frappe.ui.BaseList = Class.extend({
onchange: () => { me.refresh(true); }
});

var has_standard_filters = false;
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…
Cancel
Save