[Koha-cvs] CVS: koha/members memberentry.pl,1.12,1.13 moremember.pl,1.11,1.12

[Henri-Damien LAURENT]

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10481/members

Modified Files:
        memberentry.pl moremember.pl 
Log Message:
Adding superlibrarian rights when IndependantBranches is set.


Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** memberentry.pl      28 Jul 2005 17:38:29 -0000      1.12
--- memberentry.pl      29 Jul 2005 08:33:48 -0000      1.13
***************
*** 228,232 ****
                if (C4::Context->preference("IndependantBranches")) {
                        my $userenv = C4::Context->userenv;
!                       unless ($userenv->{flags} == 1){
                                push @select_branch, $branch if ($branch eq 
$userenv->{branch});
                                $select_branches{$branch} = 
$branches->{$branch}->{'branchname'} if ($branch eq $userenv->{branch});
--- 228,236 ----
                if (C4::Context->preference("IndependantBranches")) {
                        my $userenv = C4::Context->userenv;
!                       if ($userenv->{flags} == 1){
!                               push @select_branch, $branch;
!                               $select_branches{$branch} = 
$branches->{$branch}->{'branchname'};
!                               $default = $data->{'branchcode'};
!                       } else {
                                push @select_branch, $branch if ($branch eq 
$userenv->{branch});
                                $select_branches{$branch} = 
$branches->{$branch}->{'branchname'} if ($branch eq $userenv->{branch});

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** moremember.pl       28 Jul 2005 17:30:18 -0000      1.11
--- moremember.pl       29 Jul 2005 08:33:48 -0000      1.12
***************
*** 138,141 ****
--- 138,142 ----
                $samebranch = ($data->{'branchcode'} eq $userenv->{branch});
        }
+       $samebranch =1 if ($userenv->{flags} == 1);
  }