Bug 15294: Koha::Libraries - Rewrite the admin scripts

[srvgit] / admin / fieldmapping.pl

diff --git a/admin/fieldmapping.pl b/admin/fieldmapping.pl
index bd3ca1b..05b5202 100755 (executable)
--- a/admin/fieldmapping.pl
+++ b/admin/fieldmapping.pl
@@ -3,22 +3,22 @@
 #
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 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::Biblio;
 use C4::Koha;
@@ -31,23 +31,30 @@ my $framework = $query->param('framework') || "";
 my $field         = $query->param('fieldname');
 my $fieldcode     = $query->param('marcfield');
 my $subfieldcode  = $query->param('marcsubfield');
-my $op            = $query->param('op');
+my $op            = $query->param('op') || q{};
 my $id            = $query->param('id');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/fieldmapping.tmpl",
+    = get_template_and_user({template_name => "admin/fieldmapping.tt",
                             query => $query,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {parameters => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
                             debug => 1,
                             });
 
 # get framework list
 my $frameworks = getframeworks();
 my @frameworkloop;
+my $selected;
+my $frameworktext;
 foreach my $thisframeworkcode (keys %$frameworks) {
-       my $selected = 1 if $thisframeworkcode eq $framework;
+        if ($thisframeworkcode eq $framework){
+                $selected = 1;
+                $frameworktext = $frameworks->{$thisframeworkcode}->{'frameworktext'};
+     } else {
+               $selected = 0;
+     }
        my %row =(value => $thisframeworkcode,
                                selected => $selected,
                                frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
@@ -67,11 +74,11 @@ if($field and $fieldcode){
 }
 
 my $fieldloop = GetFieldMapping($framework);
-warn Data::Dumper::Dumper($fieldloop->[1]);
 
 $template->param( frameworkloop => \@frameworkloop, 
                   framework     => $framework,
+                  frameworktext => $frameworktext,
                   fields        => $fieldloop,
                 );
 
-output_html_with_http_headers $query, $cookie, $template->output;
\ No newline at end of file
+output_html_with_http_headers $query, $cookie, $template->output;