From de7dd395838ebe1ac944540cbd74fb409003d70b Mon Sep 17 00:00:00 2001
From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Date: Fri, 18 Jul 2014 22:51:22 -0300
Subject: [PATCH] Bug 766: Remove CGI::scrollinglist from marctagstructure.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 editor)

To test:
1. Apply the patch
2. Go to Administration > MARC frameworks
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
Do not we need an AuthorisedValues.pm? (on C4 or Koha)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes tests and QA script.

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

diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 3ff48b442e..c914442fb7 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -100,20 +100,13 @@ if ($op eq 'add_form') {
 		$sth->execute($searchfield,$frameworkcode);
 		$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',
-			-values=> \@authorised_values,
-			-size=>1,
-			-id=>"authorised_value",
-			-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/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index 80f374875a..219389dc21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -92,7 +92,17 @@ $(document).ready(function() {
             <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>
+    <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="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="Save changes" />
-- 
2.11.0