From 2326f1c5f1eb1be0320194269416641309cfb4f8 Mon Sep 17 00:00:00 2001
From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Date: Sat, 19 Jul 2014 14:47:00 -0300
Subject: [PATCH] Bug 12612: Remove CGI::scrolling_list from
 auth_tag_structure.pl

This patch removes the only instance in this file.

Don't know if the feature is of some utility, seems
that does not work (no use of auth values as indicators
on MARC authority editor)

To test:
1. Apply the patch
2. Go to Administration > Authority types
3. Clic on MARC structure of any fw
4. Clic Edit on any tag
5. On tag editor check the pulldown 'Authorised value', that was replaced
6. Check for regressions: select a value, save, verify the value, change
again, etc.

Note: removed a SELECT, using now C4::Koha::GetAuthorisedValueCategories

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as expected, no regressions found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 admin/auth_tag_structure.pl                   | 21 +++++++------------
 .../en/modules/admin/auth_tag_structure.tt    | 18 +++++++++++++---
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index 3b06cc2774..faf07271c5 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -100,20 +100,13 @@ if ($op eq 'add_form') {
         $sth->execute($searchfield,$authtypecode);
         $data=$sth->fetchrow_hashref;
     }
-    my $sth = $dbh->prepare("select distinct category from authorised_values");
-    $sth->execute;
-    my @authorised_values;
-    push @authorised_values,"";
-    while ((my $category) = $sth->fetchrow_array) {
-        push @authorised_values, $category;
-    }
-    my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
-            -id=>'authorised_value',
-            -values=> \@authorised_values,
-            -size=>1,
-            -multiple=>0,
-            -default => $data->{'authorised_value'},
-            );
+
+    my @authorised_values = @{C4::Koha::GetAuthorisedValueCategories()};    # function returns array ref, dereferencing
+    unshift @authorised_values, "";                                         # put empty value first
+    my $authorised_value = {
+        values  => \@authorised_values,
+        default => $data->{'authorised_value'},
+    };
 
     if ($searchfield) {
         $template->param('searchfield' => $searchfield);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
index 1d7ee4fbd5..43892ecbbe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -108,9 +108,21 @@
             [% ELSE %]
                 <input type="checkbox" name="mandatory" id="mandatory" value="1" />
             [% END %]
-            </li>
-        <li><label for="authorised_value">Authorized value: </label>[% authorised_value %] (if you select a value here, the indicators will be limited to the authorized value list)</li>
-</ol></fieldset>
+        </li>
+        <li><label for="authorised_value">Authorized value: </label>
+            <select name="authorised_value" id="authorised_value" size="1">
+            [% FOREACH value IN authorised_value.values %]
+                [% IF ( value == authorised_value.default ) %]
+                    <option value="[% value %]" selected>[% value %]</option>
+                [% ELSE %]
+                    <option value="[% value %]">[% value %]</option>
+                [% END %]
+            [% END %]
+            </select>
+            (if you select a value here, the indicators will be limited to the authorized value list)
+        </li>
+        </ol>
+        </fieldset>
         <fieldset class="action">
             <input type="submit" value="Submit" />
             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode %]" class="cancel">Cancel</a>