X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Ffieldmapping.pl;h=1552010530cc3261fed658b6705afa4e7cf48066;hb=2ef8ff9846b0f2014d92e65edb74dd9d71e59147;hp=bd3ca1bf3c2f6af35c82e7b89a446d0e942bba75;hpb=4747ea7462c04770484386538b1594c1760bc75b;p=koha_fer

diff --git a/admin/fieldmapping.pl b/admin/fieldmapping.pl
index bd3ca1bf3c..1552010530 100755
--- a/admin/fieldmapping.pl
+++ b/admin/fieldmapping.pl
@@ -12,9 +12,9 @@
 # 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -31,7 +31,7 @@ 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)
@@ -39,15 +39,22 @@ my ($template, $loggedinuser, $cookie)
 			     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;