From a3288f06d7fea1ace36ba180bd248cb6d31a465f Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 25 May 2011 12:52:23 -0400
Subject: [PATCH] Fix for Bug 6417 - Template variable errors in Guided Reports

Looks like the T:T conversion script missed these instances
of TMPL markup because they had line breaks:

<!-- TMPL_VAR
NAME="name" -->

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d19998413a7a67798626400466e8adaee167a579)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 .../prog/en/modules/reports/guided_reports_start.tt | 13 +++----------
 1 file changed, 3 insertions(+), 10 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 63c6ccd02a..519042fdb8 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
@@ -374,8 +374,7 @@ canned reports and writing custom SQL reports.</p>
 [% IF ( definitions ) %]
 <fieldset><legend>Dictionary Definitions</legend><table>
 [% FOREACH definition IN definitions %]
-    <tr><td><input type="checkbox" name="definition" value="<!--
-TMPL_VAR NAME="id" -->" /> [% definition.name %]</td></tr>
+    <tr><td><input type="checkbox" name="definition" value="[% id %]" /> [% definition.name %]</td></tr>
 [% END %]
 </table>
 [% END %]
@@ -397,10 +396,7 @@ TMPL_VAR NAME="id" -->" /> [% definition.name %]</td></tr>
 <input type="hidden" name="criteria" value="[% criteriastring %]" />
 <fieldset><table>
 [% FOREACH total_b IN total_by %]
-<tr><td><input type="checkbox" name="total_by" id="<!-- TMPL_VAR
-NAME="name" -->" value="<!-- TMPL_VAR
-NAME="name" -->" /> <label for="<!-- TMPL_VAR
-NAME="name" -->">[% total_b.name %]</label></td>
+<tr><td><input type="checkbox" name="total_by" id="[% total_b.name %]" value="[% total_b.name %]" /> <label for="[% total_b.name %]">[% total_b.name %]</label></td>
 <td><select name="[% total_b.name %]_tvalue">
 
 [% FOREACH selec IN total_b.select %]
@@ -429,10 +425,7 @@ NAME="name" -->">[% total_b.name %]</label></td>
 <input type="hidden" name="definition" value="[% definition %]" />
 <input type="hidden" name="totals" value="[% totals %]" />
 <fieldset><table>[% FOREACH order_b IN order_by %]
-<tr><td><input type="checkbox" id="<!-- TMPL_VAR
-NAME="name" -->" name="order_by" value="<!-- TMPL_VAR
-NAME="name" -->" /> <label for="<!-- TMPL_VAR
-NAME="name" -->">[% order_b.name %]</label></td><td>
+<tr><td><input type="checkbox" id="[% order_b.name %]" name="order_by" value="[% order_b.name %]" /> <label for="[% order_b.name %]">[% order_b.name %]</label></td><td>
 <select name="[% order_b.name %]_ovalue">
 
 [% FOREACH selec IN order_b.select %]
-- 
2.39.5