From 7c9f2c7debe6103fb6ce742f29120c0ef751094e Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 3 Jul 2017 12:29:49 +0530 Subject: [PATCH 1/3] [enahnce] Fetch doctype's roles in report if developer mode is on or is standard is no (#3591) * [enahnce] Fetch doctype's role in report if developer mode is on or is standard is no * Update report.py lets not keep separate rules for developer_mode! - this is not discoverable by a new developer --- frappe/core/doctype/report/report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 6151890183..7c18d5fd27 100644 --- a/frappe/core/doctype/report/report.py +++ b/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) From e4ba84fe74a910f02de7c8ea44e665d2fcf65fb5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 3 Jul 2017 13:20:19 +0530 Subject: [PATCH 2/3] [minor] dont render filters for no value fields --- frappe/public/js/frappe/ui/base_list.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/base_list.js b/frappe/public/js/frappe/ui/base_list.js index 8f04efe6ba..21b10339fc 100644 --- a/frappe/public/js/frappe/ui/base_list.js +++ b/frappe/public/js/frappe/ui/base_list.js @@ -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] != ""){ From 89f0145748734e5e706e3a609d01934c0c921401 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 3 Jul 2017 14:38:22 +0600 Subject: [PATCH 3/3] bumped to version 8.2.4 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 6e2301aacb..d1c5bc04e7 100644 --- a/frappe/__init__.py +++ b/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()