From 2cf0a7ebe6162abc822bab63feb0f24e80856060 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Fri, 27 Mar 2015 10:03:32 +0100
Subject: [PATCH] Bug 6911: Remember search terms in the log viewer tool
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The modules and actions selected by the user are now selected when a
log search is done.
Note that this patch also add the multiple attribute to the actions
select in order to add the ability to select several actions.
The code to do that already existed.

Test plan:
1/ Go on the log viewer tool (tools/viewlog.pl)
2/ Launch a search with modules and actions selected.
3/ Confirm that the values you have selected is still selected after the
search.

Patch works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit b8db092a0acf0c34cd78e35332f73636cdff6e22)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Conflicts:
	tools/viewlog.pl
---
 .../prog/en/modules/tools/viewlog.tt          | 53 ++++++++++++-------
 tools/viewlog.pl                              |  6 +--
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
index 96cac2d1e3..634092fbef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -67,24 +67,41 @@
 								<label for="user">Librarian:</label>
 								<input type="text" name="user" id="user" value="[% user %]" />
 							</li>
-							<li>
-								<label for="modules">Module:</label>
-								<select name="modules" id="modules" multiple="multiple">
-									<option value="" selected="selected">All</option>
-                                                                        [% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' ] %]
-                                                                        <option value="[% modx %]">[% PROCESS translate_log_module module=modx %]</option>
-                                                                        [% END %]
-								</select>
-							</li>
-							<li>
-								<label for="action">Action:</label>
-								<select name="action" id="action">
-									<option value ="">All</option>
-                                                                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'CREATE' ] %]
-                                                                        <option value="[% actx %]">[% PROCESS translate_log_action action=actx %]</option>
-                                                                        [% END %]
-								</select>
-							</li>
+                        <li>
+                                <label for="modules">Modules:</label>
+                                <select name="modules" id="modules" multiple="multiple">
+                                    [% UNLESS modules %]
+                                        <option value="" selected="selected">All</option>
+                                    [% ELSE %]
+                                        <option value="">All</option>
+                                    [% END %]
+                                    [% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' ] %]
+                                        [% IF modules.grep(modx).size %]
+                                            <option value="[% modx %]" selected="selected">[% PROCESS translate_log_module module=modx %]</option>
+                                        [% ELSE %]
+                                            <option value="[% modx %]">[% PROCESS translate_log_module module=modx %]</option>
+                                        [% END %]
+                                    [% END %]
+                                </select>
+                            </li>
+                            <li>
+                                <label for="actions">Actions:</label>
+                                <select name="actions" id="actions" multiple="multiple">
+                                    [% UNLESS actions %]
+                                        <option value="" selected="selected">All</option>
+                                    [% ELSE %]
+                                        <option value="">All</option>
+                                    [% END %]
+
+                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'CREATE' ] %]
+                                        [% IF actions.grep(actx).size %]
+                                            <option value="[% actx %]" selected="selected">[% PROCESS translate_log_action action=actx %]</option>
+                                        [% ELSE %]
+                                                <option value="[% actx %]">[% PROCESS translate_log_action action=actx %]</option>
+                                        [% END %]
+                                    [% END %]
+                                </select>
+                            </li>
 							<li>
 								<label for="object">Object: </label>
 								<input type="text" id="object" name="object" value="[% object %]" />
diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 3555612fbf..23eddc7ce2 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -191,13 +191,9 @@ if ($do_it) {
             action   => \@actions,
             info     => $info,
             src      => $src,
+            modules  => \@modules,
         );
 
-        # Used modules
-        foreach my $module (@modules) {
-            $template->param( $module => 1 );
-        }
-
         output_html_with_http_headers $input, $cookie, $template->output;
     }
     else {
-- 
2.39.5