From 7cfa3b690bd28d123e37a9fe66552d791e8cbb96 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 29 Jun 2017 16:23:30 +0530 Subject: [PATCH 1/2] [fixes] fixes in standard filters --- frappe/public/js/frappe/list/list_view.js | 6 ++++-- frappe/public/js/frappe/ui/base_list.js | 11 ++++++++++- frappe/public/js/frappe/views/reports/reportview.js | 8 ++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index f768f42372..05facf346d 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -497,8 +497,10 @@ frappe.views.ListView = frappe.ui.BaseList.extend({ } } - this.list_header.find('.list-liked-by-me') - .toggleClass('text-extra-muted not-liked', !this.is_star_filtered()); + if(this.list_header) { + this.list_header.find('.list-liked-by-me') + .toggleClass('text-extra-muted not-liked', !this.is_star_filtered()); + } this.last_updated_on = new Date(); this.dirty = false; diff --git a/frappe/public/js/frappe/ui/base_list.js b/frappe/public/js/frappe/ui/base_list.js index 8b41548660..1902d288a8 100644 --- a/frappe/public/js/frappe/ui/base_list.js +++ b/frappe/public/js/frappe/ui/base_list.js @@ -189,16 +189,25 @@ frappe.ui.BaseList = Class.extend({ options:this.doctype, label:'ID', fieldname:'name', + onchange: () => { me.refresh(true); } }); var has_standard_filters = false; this.meta.fields.forEach(function(df) { if(df.in_standard_filter) { + if(df.fieldtype == "Select") { + var options = df.options.split("\n") + if(options.length > 0 && options[0] != ""){ + options.unshift(""); + df.options = options.join("\n"); + } + } me.page.add_field({ fieldtype: df.fieldtype, label: __(df.label), options: df.options, - fieldname: df.fieldname + fieldname: df.fieldname, + onchange: () => {me.refresh(true);} }); } }); diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js index 0f75aae67d..9fb230dbb1 100644 --- a/frappe/public/js/frappe/views/reports/reportview.js +++ b/frappe/public/js/frappe/views/reports/reportview.js @@ -260,7 +260,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({ // build args for query get_args: function() { let me = this; - let filters = this.filter_list.get_filters(); + let filters = this.filter_list? this.filter_list.get_filters(): []; return { doctype: this.doctype, @@ -284,7 +284,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({ } // second - if(this.sort_by_next_select.val()) { + if(this.sort_by_next_select && this.sort_by_next_select.val()) { order_by.push(this.get_selected_table_and_column(this.sort_by_next_select) + ' ' + this.sort_order_next_select.val()); } @@ -293,6 +293,10 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({ }, get_selected_table_and_column: function(select) { + if(!select) { + return + } + return select.selected_doctype ? this.get_full_column_name([select.selected_fieldname, select.selected_doctype]) : ""; }, From a638d1b0404a6b5eb2a0eb75d2a257b747fbf136 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 29 Jun 2017 17:03:33 +0600 Subject: [PATCH 2/2] bumped to version 8.2.1 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 968664afb1..0bc1471e14 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.0' +__version__ = '8.2.1' __title__ = "Frappe Framework" local = Local()