vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2793 from mbauskar/hotfix

Browse source 
[minor] filter dashboard fixes
This commit is contained in:
Nabin Hait 2017-03-02 16:57:26 +05:30 • committed by GitHub
commit 16e437db7d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/ui/listing.js
View file

@ -413,7 +413,7 @@ frappe.ui.Listing = Class.extend({
query += ' LIMIT ' + this.start + ',' + (this.page_length+1);
return query
},
set_filter: function(parent, fieldname, label, no_run, no_duplicate) {
set_filter: function(fieldname, label, no_run, no_duplicate, parent) {
var filter = this.filter_list.get_filter(fieldname);
doctype = parent && this.doctype != parent? parent: this.doctype

2
frappe/public/js/frappe/views/reports/reportview.js
View file

@ -350,7 +350,7 @@ frappe.views.ReportView = frappe.ui.Listing.extend({
});
if(!filter_set) {
this.set_filter(parent, fieldname, value);
this.set_filter(fieldname, value, false, false, parent);
} else {
var df = frappe.meta.get_docfield(parent, fieldname);
if(df.fieldtype==='Link') {