X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmember-flags.pl;h=7b0810800e9229f8808a6dd0c6a381bccce49f20;hb=09b8ce2a5f6ef81a2bc3c347a92d01ba7bc5845d;hp=749ceccb343fccde7b47050e8a149eeab1c1ec12;hpb=832e9abf647fdc06df3d3b53b4fbd2ed56aabad7;p=koha.git

diff --git a/members/member-flags.pl b/members/member-flags.pl
index 749ceccb34..7b0810800e 100755
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -13,6 +13,7 @@ use C4::Auth qw(:DEFAULT :EditPermissions);
 use C4::Context;
 use C4::Members;
 use C4::Branch;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 #use C4::Acquisitions;
 
 use C4::Output;
@@ -66,19 +67,17 @@ if ($input->param('newflags')) {
     $sth = $dbh->prepare("UPDATE borrowers SET flags=? WHERE borrowernumber=?");
     $sth->execute($module_flags, $member);
     
-    if (C4::Context->preference('GranularPermissions')) {
-        # deal with subpermissions
-        $sth = $dbh->prepare("DELETE FROM user_permissions WHERE borrowernumber = ?");
-        $sth->execute($member); 
-        $sth = $dbh->prepare("INSERT INTO user_permissions (borrowernumber, module_bit, code)
-                            SELECT ?, bit, ?
-                            FROM userflags
-                            WHERE flag = ?");
-        foreach my $module (keys %sub_perms) {
-            next if exists $all_module_perms{$module};
-            foreach my $sub_perm (@{ $sub_perms{$module} }) {
-                $sth->execute($member, $sub_perm, $module);
-            }
+    # deal with subpermissions
+    $sth = $dbh->prepare("DELETE FROM user_permissions WHERE borrowernumber = ?");
+    $sth->execute($member); 
+    $sth = $dbh->prepare("INSERT INTO user_permissions (borrowernumber, module_bit, code)
+                        SELECT ?, bit, ?
+                        FROM userflags
+                        WHERE flag = ?");
+    foreach my $module (keys %sub_perms) {
+        next if exists $all_module_perms{$module};
+        foreach my $sub_perm (@{ $sub_perms{$module} }) {
+            $sth->execute($member, $sub_perm, $module);
         }
     }
     
@@ -104,53 +103,51 @@ if ($input->param('newflags')) {
 		    checked => $checked,
 		    flagdesc => $flagdesc );
 
-        if (C4::Context->preference('GranularPermissions')) {
-            my @sub_perm_loop = ();
-            my $expand_parent = 0;
-            if ($checked) {
-                if (exists $all_perms->{$flag}) {
-                    $expand_parent = 1;
-                    foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) {
-                        push @sub_perm_loop, {
-                            id => "${flag}_$sub_perm",
-                            perm => "$flag:$sub_perm",
-                            code => $sub_perm,
-                            description => $all_perms->{$flag}->{$sub_perm},
-                            checked => 1
-                        };
-                    }
+        my @sub_perm_loop = ();
+        my $expand_parent = 0;
+        if ($checked) {
+            if (exists $all_perms->{$flag}) {
+                $expand_parent = 1;
+                foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) {
+                    push @sub_perm_loop, {
+                        id => "${flag}_$sub_perm",
+                        perm => "$flag:$sub_perm",
+                        code => $sub_perm,
+                        description => $all_perms->{$flag}->{$sub_perm},
+                        checked => 1
+                    };
                 }
-            } else {
-                if (exists $user_perms->{$flag}) {
-                    $expand_parent = 1;
-                    # put selected ones first
-                    foreach my $sub_perm (sort keys %{ $user_perms->{$flag} }) {
-                        push @sub_perm_loop, {
-                            id => "${flag}_$sub_perm",
-                            perm => "$flag:$sub_perm",
-                            code => $sub_perm,
-                            description => $all_perms->{$flag}->{$sub_perm},
-                            checked => 1
-                        };
-                    }
+            }
+        } else {
+            if (exists $user_perms->{$flag}) {
+                $expand_parent = 1;
+                # put selected ones first
+                foreach my $sub_perm (sort keys %{ $user_perms->{$flag} }) {
+                    push @sub_perm_loop, {
+                        id => "${flag}_$sub_perm",
+                        perm => "$flag:$sub_perm",
+                        code => $sub_perm,
+                        description => $all_perms->{$flag}->{$sub_perm},
+                        checked => 1
+                    };
                 }
-                # then ones not selected
-                if (exists $all_perms->{$flag}) {
-                    foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) {
-                        push @sub_perm_loop, {
-                            id => "${flag}_$sub_perm",
-                            perm => "$flag:$sub_perm",
-                            code => $sub_perm,
-                            description => $all_perms->{$flag}->{$sub_perm},
-                            checked => 0
-                        } unless exists $user_perms->{$flag} and exists $user_perms->{$flag}->{$sub_perm};
-                    }
+            }
+            # then ones not selected
+            if (exists $all_perms->{$flag}) {
+                foreach my $sub_perm (sort keys %{ $all_perms->{$flag} }) {
+                    push @sub_perm_loop, {
+                        id => "${flag}_$sub_perm",
+                        perm => "$flag:$sub_perm",
+                        code => $sub_perm,
+                        description => $all_perms->{$flag}->{$sub_perm},
+                        checked => 0
+                    } unless exists $user_perms->{$flag} and exists $user_perms->{$flag}->{$sub_perm};
                 }
             }
-            $row{expand} = $expand_parent;
-            if ($#sub_perm_loop > -1) {
+        }
+        $row{expand} = $expand_parent;
+        if ($#sub_perm_loop > -1) {
             $row{sub_perm_loop} = \@sub_perm_loop;
-            }
         }
 	    push @loop, \%row;
     }
@@ -163,9 +160,17 @@ if ($input->param('newflags')) {
     }
 	
 $template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
-    my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($bor->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
-		
+
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
+
 $template->param(
 		borrowernumber => $bor->{'borrowernumber'},
     cardnumber => $bor->{'cardnumber'},
@@ -177,6 +182,7 @@ $template->param(
 		address => $bor->{'address'},
 		address2 => $bor->{'address2'},
 		city => $bor->{'city'},
+        state => $bor->{'state'},
 		zipcode => $bor->{'zipcode'},
 		country => $bor->{'country'},
 		phone => $bor->{'phone'},
@@ -185,6 +191,8 @@ $template->param(
 		branchname => GetBranchName($bor->{'branchcode'}),
 		loop => \@loop,
 		is_child        => ($bor->{'category_type'} eq 'C'),
+		activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+        RoutingSerials => C4::Context->preference('RoutingSerials'),
 		);
 
     output_html_with_http_headers $input, $cookie, $template->output;