')
- .data("data", (this.meta && this.meta.image_view) == 0 ? row : null)
- .appendTo(this.wrapper.find('.result-list'))
- .get(0);
- },
- refresh: function() {
- this.run();
- },
- add_limits: function(query) {
- query += ' LIMIT ' + this.start + ',' + (this.page_length+1);
- return query
- },
- set_filter: function(fieldname, label, no_run, no_duplicate, parent) {
- var filter = this.filter_list.get_filter(fieldname);
- var doctype = parent && this.doctype != parent? parent: this.doctype
-
- if(filter) {
- var v = cstr(filter.field.get_parsed_value());
- if(v.indexOf(label)!=-1) {
- // already set
- return false
-
- } else if(no_duplicate) {
- filter.set_values(doctype, fieldname, "=", label);
- } else {
- // second filter set for this field
- if(fieldname=='_user_tags' || fieldname=="_liked_by") {
- // and for tags
- this.filter_list.add_filter(doctype, fieldname, 'like', '%' + label + '%');
- } else {
- // or for rest using "in"
- filter.set_values(doctype, fieldname, 'in', v + ', ' + label);
- }
- }
- } else {
- // no filter for this item,
- // setup one
- if(['_user_tags', '_comments', '_assign', '_liked_by'].indexOf(fieldname)!==-1) {
- this.filter_list.add_filter(doctype, fieldname, 'like', '%' + label + '%');
- } else {
- this.filter_list.add_filter(doctype, fieldname, '=', label);
- }
- }
- if(!no_run)
- this.run();
- },
- init_list_settings: function() {
- if(frappe.model.list_settings[this.doctype]) {
- this.list_settings = frappe.model.list_settings[this.doctype];
- } else {
- this.list_settings = {};
- }
- },
- call_for_selected_items: function(method, args) {
- var me = this;
- args.names = $.map(this.get_checked_items(), function(d) { return d.name; });
-
- frappe.call({
- method: method,
- args: args,
- freeze: true,
- callback: function(r) {
- if(!r.exc) {
- if(me.list_header) {
- me.list_header.find(".list-select-all").prop("checked", false);
- }
- me.refresh();
- }
- }
- });
- }
-});
diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js
index 54e08fa50b..39dbdc002d 100644
--- a/frappe/public/js/frappe/views/reports/reportview.js
+++ b/frappe/public/js/frappe/views/reports/reportview.js
@@ -23,7 +23,6 @@ frappe.views.ReportViewPage = Class.extend({
frappe.model.with_doctype(this.doctype, function() {
me.make_report_view();
if(me.docname) {
-
frappe.model.with_doc('Report', me.docname, function(r) {
me.parent.reportview.set_columns_and_filters(
JSON.parse(frappe.get_doc("Report", me.docname).json || '{}'));
@@ -31,7 +30,7 @@ frappe.views.ReportViewPage = Class.extend({
me.parent.reportview.run();
});
} else {
- me.parent.reportview.set_route_filters(true);
+ me.parent.reportview.set_route_filters();
me.parent.reportview.run();
}
});
@@ -45,8 +44,9 @@ frappe.views.ReportViewPage = Class.extend({
frappe.container.change_to(this.page_name);
$(this.parent).on('show', function(){
- if(me.parent.reportview.set_route_filters())
+ if(me.parent.reportview.set_route_filters()) {
me.parent.reportview.run();
+ }
});
},
make_report_view: function() {
@@ -77,7 +77,7 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
this.add_totals_row = 0;
this.page = this.parent.page;
this._body = $('
').appendTo(this.page.main);
- this.page_title = __('Report')+ ': ' + (this.docname ?
+ this.page_title = __('Report')+ ': ' + (this.docname ?
__(this.doctype) + ' - ' + __(this.docname) : __(this.doctype));
this.page.set_title(this.page_title);
this.init_user_settings();
@@ -226,10 +226,10 @@ frappe.views.ReportView = frappe.ui.BaseList.extend({
this.add_totals_row = cint(opts.add_totals_row);
},
- set_route_filters: function(first_load) {
+ set_route_filters: function() {
var me = this;
if(frappe.route_options) {
- this.set_filters_from_route_options();
+ this.set_filters_from_route_options({clear_filters: this.docname ? false : true});
return true;
} else if(this.user_settings
&& this.user_settings.filters