Bug 13931 - Date of birth in patron search result and in autocomplete

[koha.git] / admin / marctagstructure.pl

diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 0326b93..7728687 100755 (executable)
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -5,28 +5,29 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Koha;
 use C4::Context;
 use C4::Output;
 use C4::Context;
 
+use Koha::Cache;
 
 # retrieve parameters
 my $input = new CGI;
@@ -39,16 +40,17 @@ $searchfield=~ s/\,//g;
 
 my $offset    = $input->param('offset') || 0;
 my $op        = $input->param('op')     || '';
-my $dspchoice = $input->param('select_display');
+my $dspchoice = $input->cookie("marctagstructure_selectdisplay") // $input->param('select_display');
 my $pagesize = 20;
 
 my $script_name = "/cgi-bin/koha/admin/marctagstructure.pl";
 
 my $dbh = C4::Context->dbh;
+my $cache = Koha::Cache->get_instance();
 
 # open template
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/marctagstructure.tmpl",
+    = get_template_and_user({template_name => "admin/marctagstructure.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
@@ -100,20 +102,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);
@@ -126,16 +121,8 @@ if ($op eq 'add_form') {
        $template->param('use_heading_flags_p' => 1);
        $template->param(liblibrarian => $data->{'liblibrarian'},
                        libopac => $data->{'libopac'},
-                       repeatable => CGI::checkbox(-name=>'repeatable',
-                                               -checked=> $data->{'repeatable'}?'checked':'',
-                                               -value=> 1,
-                                               -label => '',
-                                               -id=> 'repeatable'),
-                       mandatory => CGI::checkbox(-name => 'mandatory',
-                                               -checked => $data->{'mandatory'}?'checked':'',
-                                               -value => 1,
-                                               -label => '',
-                                               -id => 'mandatory'),
+            repeatable => $data->{'repeatable'},
+            mandatory => $data->{'mandatory'},
                        authorised_value => $authorised_value,
                        frameworkcode => $frameworkcode,
     );  # FIXME: move checkboxes to presentation layer
@@ -175,9 +162,11 @@ if ($op eq 'add_form') {
                           $frameworkcode
             );
         }
-       }
+        $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
+        $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
+    }
     print $input->redirect("/cgi-bin/koha/admin/marctagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode");
-       exit;
+    exit;
                                                                                                        # END $OP eq ADD_VALIDATE
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
@@ -199,6 +188,8 @@ if ($op eq 'add_form') {
         my $sth2 = $dbh->prepare("DELETE FROM marc_subfield_structure WHERE tagfield=? AND frameworkcode=?");
         $sth1->execute($searchfield, $frameworkcode);
         $sth2->execute($searchfield, $frameworkcode);
+        $cache->clear_from_cache("MarcStructure-0-$frameworkcode");
+        $cache->clear_from_cache("MarcStructure-1-$frameworkcode");
        }
        $template->param(
           searchfield => $searchfield,
@@ -362,5 +353,7 @@ sub duplicate_framework {
        while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso,$hidden) = $sth->fetchrow) {
            $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $kohafield, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso, $hidden);
        }
+    $cache->clear_from_cache("MarcStructure-0-$newframeworkcode");
+    $cache->clear_from_cache("MarcStructure-1-$newframeworkcode");
 }