From a901a946e0450507aca46b7aec9d90aa5459a7a8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 16 Mar 2012 11:36:46 +0100 Subject: [PATCH 1/1] Bug 5698: Followup: Add date picker option to SQL Runtime Parameters Move html --- .../en/modules/reports/guided_reports_start.tt | 16 +++++++++++++++- reports/guided_reports.pl | 13 +------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index caf27f1..4c2dc00 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -486,7 +486,21 @@ canned reports and writing custom SQL reports.

Enter parameters for report [% name %]:

[% IF ( notes ) %]

[% notes %]

[% END %] [% FOREACH sql_param IN sql_params %] -

[% sql_param.entry %]: [% sql_param.input %]

+ [% IF sql_param.input == 'date' %] +

+ [% sql_param.entry %]: + Show Calendar + +

+ [% ELSE %] +

[% sql_param.entry %]: [% sql_param.input %]

+ [% END %] [% END %] diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index ce9370a..5d53791 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -421,18 +421,7 @@ elsif ($phase eq 'Run this report'){ my ($text,$authorised_value) = split /\|/,$split[$i*2+1]; my $input; if ($authorised_value eq "date") { - $input = qq( - Show Calendar - - ); + $input = 'date'; } elsif ($authorised_value) { my $dbh=C4::Context->dbh; -- 1.7.7.3