From 65b5bdf8e1022b0f5d3dec2a03a0e147d298e62e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 11 Oct 2010 20:56:41 -0400 Subject: [PATCH] Fix for Bug 4261 - keyword mapping should show which framework the map is for Signed-off-by: Nicole Engard Signed-off-by: Galen Charlton --- admin/fieldmapping.pl | 10 +++++++++- .../prog/en/modules/admin/fieldmapping.tmpl | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/admin/fieldmapping.pl b/admin/fieldmapping.pl index b7122b0a90..f7eca3c808 100755 --- a/admin/fieldmapping.pl +++ b/admin/fieldmapping.pl @@ -46,8 +46,15 @@ my ($template, $loggedinuser, $cookie) # 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'}, @@ -70,6 +77,7 @@ my $fieldloop = GetFieldMapping($framework); $template->param( frameworkloop => \@frameworkloop, framework => $framework, + frameworktext => $frameworktext, fields => $fieldloop, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl index 3781398a70..0e4e0a0f50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl @@ -25,15 +25,15 @@ $(document).ready(function() {

Keyword to MARC Mapping

-

There are no mappings for this framework.

+

There are no mappings for the default framework.

- +