Bug 10363: FIX rebase conflict error
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Tue, 4 Aug 2015 13:24:50 +0000 (14:24 +0100)
committerTomas Cohen Arazi <tomascohen@theke.io>
Mon, 19 Oct 2015 15:46:28 +0000 (12:46 -0300)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
admin/authorised_values.pl

index 1cf683d..620ddc7 100755 (executable)
@@ -60,7 +60,7 @@ if ($op eq 'add_form') {
     my @branches_loop;
 
     foreach my $branchcode ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) {
-        my $selected = ( grep {$_->{branchcode} eq $branchcode} @$selected_branches ) ? 1 : 0;
+        my $selected = ( grep {$_ eq $branchcode} @$selected_branches ) ? 1 : 0;
         push @branches_loop, {
             branchcode => $branchcode,
             branchname => $branches->{$branchcode}->{branchname},