Bug fixing : 2516

[koha.git] / members / member-flags.pl

diff --git a/members/member-flags.pl b/members/member-flags.pl
index ac1ca5d..64de60a 100755 (executable)
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -64,7 +64,7 @@ if ($input->param('newflags')) {
     $sth = $dbh->prepare("UPDATE borrowers SET flags=? WHERE borrowernumber=?");
     $sth->execute($module_flags, $member);
     
-    if (C4::Context->preference('CheckSpecificUserPermissions')) {
+    if (C4::Context->preference('GranularPermissions')) {
         # deal with subpermissions
         $sth = $dbh->prepare("DELETE FROM user_permissions WHERE borrowernumber = ?");
         $sth->execute($member); 
@@ -102,7 +102,7 @@ if ($input->param('newflags')) {
                    checked => $checked,
                    flagdesc => $flagdesc );
 
-        if (C4::Context->preference('CheckSpecificUserPermissions')) {
+        if (C4::Context->preference('GranularPermissions')) {
             my @sub_perm_loop = ();
             my $expand_parent = 0;
             if ($checked) {
@@ -153,27 +153,35 @@ if ($input->param('newflags')) {
            push @loop, \%row;
     }
 
-       my $borrowercategory = GetBorrowercategory( $bor->{'categorycode'} );
-my $category_type = $borrowercategory->{'category_type'};
-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+    if ( $bor->{'category_type'} eq 'C') {
+        my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+        my $cnt = scalar(@$catcodes);
+        $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+        $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+    }
        
-    $template->param(borrowernumber => $member,
-                   borrowernumber => $bor->{'borrowernumber'},
-               cardnumber => $bor->{'cardnumber'},
-                   surname => $bor->{'surname'},
-                   firstname => $bor->{'firstname'},
-                   categorycode => $bor->{'categorycode'},
-                   category_type => $bor->{'category_type'},
-                   category_description => $bor->{'description'},
-                   address => $bor->{'address'},
-                       address2 => $bor->{'address2'},
-                   city => $bor->{'city'},
-                       zipcode => $bor->{'zipcode'},
-                       phone => $bor->{'phone'},
-                       email => $bor->{'email'},
-                   branchcode => $bor->{'branchcode'},
-                       loop => \@loop,
-                       );
+$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
+    my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
+    $template->param( picture => 1 ) if $picture;
+               
+$template->param(
+               borrowernumber => $bor->{'borrowernumber'},
+    cardnumber => $bor->{'cardnumber'},
+               surname => $bor->{'surname'},
+               firstname => $bor->{'firstname'},
+               categorycode => $bor->{'categorycode'},
+               category_type => $bor->{'category_type'},
+               category_description => $bor->{'description'},
+               address => $bor->{'address'},
+               address2 => $bor->{'address2'},
+               city => $bor->{'city'},
+               zipcode => $bor->{'zipcode'},
+               phone => $bor->{'phone'},
+               email => $bor->{'email'},
+               branchcode => $bor->{'branchcode'},
+               loop => \@loop,
+               is_child        => ($bor->{'category_type'} eq 'C'),
+               );
 
     output_html_with_http_headers $input, $cookie, $template->output;