From 16e885916a6e74c897b1f08559b7600e450e7b8c Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 18 Feb 2014 16:30:50 +1300
Subject: [PATCH] Refs #4701 Hide the Display Options settings, when report is
CSV, since they don't apply to CSV
---
plugins/ScheduledReports/javascripts/pdf.js | 17 +++++++++++++++++
.../ScheduledReports/templates/_addReport.twig | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/plugins/ScheduledReports/javascripts/pdf.js b/plugins/ScheduledReports/javascripts/pdf.js
index 7aaff498de..d0977ff4bb 100644
--- a/plugins/ScheduledReports/javascripts/pdf.js
+++ b/plugins/ScheduledReports/javascripts/pdf.js
@@ -36,6 +36,23 @@ function formSetEditReport(idReport) {
$('#report_hour').val(report.hour);
$('[name=report_format].' + report.type + ' option[value=' + report.format + ']').prop('selected', 'selected');
+ var selectorReportFormat = 'select[name=report_format].' + $('#report_type').val();
+ $(selectorReportFormat).change( toggleDisplayOptionsByFormat );
+
+ // When CSV is selected, hide "Display options"
+ toggleDisplayOptionsByFormat();
+
+ function toggleDisplayOptionsByFormat() {
+ var format = $(selectorReportFormat).val();
+ var displayOptionsSelector = $('#row_report_display_options');
+ if (format == 'csv') {
+ displayOptionsSelector.hide();
+ } else {
+ displayOptionsSelector.show();
+ }
+ }
+
+
$('[name=reportsList] input').prop('checked', false);
var key;
diff --git a/plugins/ScheduledReports/templates/_addReport.twig b/plugins/ScheduledReports/templates/_addReport.twig
index fdbc9fe4b4..cabb1703b9 100644
--- a/plugins/ScheduledReports/templates/_addReport.twig
+++ b/plugins/ScheduledReports/templates/_addReport.twig
@@ -100,7 +100,7 @@
{{ postEvent("Template.reportParametersScheduledReports") }}
- <tr class='email'>
+ <tr id="row_report_display_options">
<td class="first">
{# ScheduledReports_AggregateReportsFormat should be named ScheduledReports_DisplayFormat #}
{{ 'ScheduledReports_AggregateReportsFormat'|translate }}
--
GitLab