Pārlūkot izejas kodu

Make hidden fields work in query report (#3261)

version-14
Faris Ansari pirms 8 gadiem
committed by Rushabh Mehta
vecāks
revīzija
c3119d58f1
2 mainītis faili ar 9 papildinājumiem un 3 dzēšanām
  1. +4
    -0
      frappe/public/js/frappe/ui/page.js
  2. +5
    -3
      frappe/public/js/frappe/views/reports/query_report.js

+ 4
- 0
frappe/public/js/frappe/ui/page.js Parādīt failu

@@ -369,6 +369,10 @@ frappe.ui.Page = Class.extend({
$(f.wrapper) $(f.wrapper)
.addClass('col-md-2') .addClass('col-md-2')
.attr("title", __(df.label)).tooltip(); .attr("title", __(df.label)).tooltip();

// hidden fields dont have $input
if(!f.$input) f.make_input();

f.$input.addClass("input-sm").attr("placeholder", __(df.label)); f.$input.addClass("input-sm").attr("placeholder", __(df.label));


if(df.fieldtype==="Check") { if(df.fieldtype==="Check") {


+ 5
- 3
frappe/public/js/frappe/views/reports/query_report.js Parādīt failu

@@ -207,8 +207,8 @@ frappe.views.QueryReport = Class.extend({
}, },
pdf_report: function() { pdf_report: function() {
var me = this; var me = this;
base_url = frappe.urllib.get_base_url();
print_css = frappe.boot.print_css;
var base_url = frappe.urllib.get_base_url();
var print_css = frappe.boot.print_css;


if(!frappe.model.can_print(this.report_doc.ref_doctype)) { if(!frappe.model.can_print(this.report_doc.ref_doctype)) {
msgprint(__("You are not allowed to make PDF for this report")); msgprint(__("You are not allowed to make PDF for this report"));
@@ -246,7 +246,7 @@ frappe.views.QueryReport = Class.extend({
}); });
} }


orientation = this.print_settings.orientation;
var orientation = this.print_settings.orientation;
this.open_pdf_report(html, orientation) this.open_pdf_report(html, orientation)
}, },
open_pdf_report: function(html, orientation) { open_pdf_report: function(html, orientation) {
@@ -407,6 +407,8 @@ frappe.views.QueryReport = Class.extend({
var mandatory_fields = []; var mandatory_fields = [];
$.each(this.filters || [], function(i, f) { $.each(this.filters || [], function(i, f) {
var v = f.get_parsed_value(); var v = f.get_parsed_value();
// TODO: hidden fields dont have $input
if(f.df.hidden) v = f.value;
if(v === '%') v = null; if(v === '%') v = null;
if(f.df.reqd && !v) mandatory_fields.push(f.df.label); if(f.df.reqd && !v) mandatory_fields.push(f.df.label);
if(v) filters[f.df.fieldname] = v; if(v) filters[f.df.fieldname] = v;


Notiek ielāde…
Atcelt
Saglabāt