From 17e82b537f7e50ff67a55daafdea072dbcc19d9e Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 11 Feb 2016 10:52:30 +0530
Subject: [PATCH] [fix] [minor] print filtered items in query report

---
 frappe/public/js/frappe/misc/tools.js                 | 7 +++++++
 frappe/public/js/frappe/views/reports/query_report.js | 4 ++--
 frappe/public/js/lib/microtemplate.js                 | 6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/misc/tools.js b/frappe/public/js/frappe/misc/tools.js
index 7a6fdc5ec2..f5a8015968 100644
--- a/frappe/public/js/frappe/misc/tools.js
+++ b/frappe/public/js/frappe/misc/tools.js
@@ -68,6 +68,13 @@ frappe.tools.to_csv = function(data) {
 };
 
 frappe.slickgrid_tools = {
+	get_filtered_items: function(dataView) {
+		var data = [];
+		for (var i=0, len=dataView.getLength(); i<len; i++) {
+			data.push(dataView.getItem(i));
+		}
+		return data;
+	},
 	get_view_data: function(columns, dataView, filter) {
 		var col_row = $.map(columns, function(v) { return v.name; });
 		var res = [];
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 852d3a0958..a0f1ced51b 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -132,7 +132,7 @@ frappe.views.QueryReport = Class.extend({
 
 			frappe.render_grid({content:content, title:__(this.report_name)});
 		} else {
-			frappe.render_grid({grid:this.grid, title:__(this.report_name)});
+			frappe.render_grid({grid:this.grid, report: this, title:__(this.report_name)});
 		}
 	},
 	setup_filters: function() {
@@ -320,7 +320,7 @@ frappe.views.QueryReport = Class.extend({
 
 				if (!df.fieldtype) df.fieldtype = "Data";
 				if (!cint(df.width)) df.width = 80;
-				
+
 				if (df.hidden) {
 					return null;
 				}
diff --git a/frappe/public/js/lib/microtemplate.js b/frappe/public/js/lib/microtemplate.js
index 3471b877ab..698c84aca3 100644
--- a/frappe/public/js/lib/microtemplate.js
+++ b/frappe/public/js/lib/microtemplate.js
@@ -58,7 +58,11 @@ frappe.render_grid = function(opts) {
 	// build context
 	if(opts.grid) {
 		opts.columns = opts.grid.getColumns();
-		opts.data = opts.grid.getData().getItems();
+		if(opts.report) {
+			opts.data = frappe.slickgrid_tools.get_filtered_items(opts.report.dataView);
+		} else if(opts.grid) {
+			opts.data = opts.grid.getData().getItems();
+		}
 	}
 
 	// render content