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

[Henri-Damien LAURENT]

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

Modified Files:
        memberentry.pl 
Log Message:
First step of independacy branch management.
Displaying only librarian branch if librarian is not superlibrarian and 
IndependantBranches is set.

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** memberentry.pl      22 Jun 2005 09:36:24 -0000      1.11
--- memberentry.pl      28 Jul 2005 17:38:29 -0000      1.12
***************
*** 224,231 ****
        my %select_branches;
        my $branches=getbranches();
        foreach my $branch (keys %$branches) {
!               push @select_branch, $branch;
!               $select_branches{$branch} = 
$branches->{$branch}->{'branchname'};
        }
        my $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
                                -id => 'branchcode',
--- 224,243 ----
        my %select_branches;
        my $branches=getbranches();
+       my $default;
        foreach my $branch (keys %$branches) {
!               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});
!                               $default = $userenv->{branch};
!                       }
!               } else {
!                       push @select_branch, $branch;
!                       $select_branches{$branch} = 
$branches->{$branch}->{'branchname'};
!                       $default = $data->{'branchcode'};
!               }
        }
+       
        my $CGIbranch=CGI::scrolling_list( -name     => 'branchcode',
                                -id => 'branchcode',