[Koha-patches] [PATCH] Bug 1542, fixing filter by area in reports dictionary

[Chris Cormack]

---
 .../prog/en/modules/reports/dictionary.tmpl        |   11 +++++++----
 reports/dictionary.pl                              |    6 ++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
index 9e21732..11d8dce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
@@ -21,16 +21,17 @@
 <!-- TMPL_IF NAME="start_dictionary" -->
 <p>Use the dictionary to define custom criteria for reporting.</p>
 
-<!-- TMPL_IF NAME="definitions" -->
+
 <h2>Current Terms</h2>
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
+<input type="hidden" name="phase" value="View Dictionary" />
 Filter by area <select name="areas">
-<option value="All">All</option>
+<option value="">All</option>
 <!-- TMPL_LOOP NAME="areas" -->     
 <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name"--></option>                  
 <!-- /TMPL_LOOP -->                
 </select> 
-<input name="phase" value="Go" type="submit" />
+<input name="submit" value="Go" type="submit" />
 </form>
 <br />
 <table border="1" cellspacing="0" cellpadding="5">
@@ -41,6 +42,7 @@ Filter by area <select name="areas">
 <th>Definition</th>
 <th>&nbsp;</th>
 </tr>
+<!-- TMPL_IF NAME="definitions" -->
 <!-- TMPL_LOOP NAME="definitions" -->
 <tr valign="top">
 <td><!-- TMPL_VAR NAME="name" --></td>
@@ -54,7 +56,8 @@ Filter by area <select name="areas">
 </form></td>
 </tr>
 <!-- /TMPL_LOOP -->
-</table><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+</table>
 <!-- /TMPL_IF -->
 
 
diff --git a/reports/dictionary.pl b/reports/dictionary.pl
index 09104c3..2c87a49 100755
--- a/reports/dictionary.pl
+++ b/reports/dictionary.pl
@@ -18,6 +18,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 use CGI::Carp qw(fatalsToBrowser warningsToBrowser);
 use strict;
+use warnings;
 use C4::Auth;
 use CGI;
 use C4::Output;
@@ -38,7 +39,8 @@ Script to control the guided report creation
 my $input = new CGI;
 my $referer = $input->referer();
 
-my $phase = $input->param('phase');
+my $phase = $input->param('phase') || 'View Dictionary';
+my $area = $input->param('areas') || '';
 my $no_html = 0; # this will be set if we dont want to print out an html::template
 my 	( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
@@ -54,7 +56,7 @@ my 	( $template, $borrowernumber, $cookie ) = get_template_and_user(
 if ($phase eq 'View Dictionary'){
 	# view the dictionary we use to set up abstract variables such as all borrowers over fifty who live in a certain town
 	my $areas = get_report_areas();
-	my $definitions = get_from_dictionary();
+	my $definitions = get_from_dictionary($area);
 	$template->param( 'areas' => $areas ,
 		'start_dictionary' => 1,
 		'definitions' => $definitions,
-- 
1.5.6.3