View | Details | Raw Unified | Return to bug 17829
Collapse All | Expand All

(-)a/C4/Acquisition.pm (-5 / +7 lines)
Lines 823-829 sub CanUserManageBasket { Link Here
823
    my ($borrower, $basket, $userflags) = @_;
823
    my ($borrower, $basket, $userflags) = @_;
824
824
825
    if (!ref $borrower) {
825
    if (!ref $borrower) {
826
        $borrower = Koha::Patrons->find( $borrower );
826
        # FIXME This needs to be replaced
827
        # We should not accept both scalar and array
828
        # Tests need to be updated
829
        $borrower = Koha::Patrons->find( $borrower )->unblessed;
827
    }
830
    }
828
    if (!ref $basket) {
831
    if (!ref $basket) {
829
        $basket = GetBasket($basket);
832
        $basket = GetBasket($basket);
Lines 831-837 sub CanUserManageBasket { Link Here
831
834
832
    return 0 unless ($basket and $borrower);
835
    return 0 unless ($basket and $borrower);
833
836
834
    my $borrowernumber = $borrower->borrowernumber;
837
    my $borrowernumber = $borrower->{borrowernumber};
835
    my $basketno = $basket->{basketno};
838
    my $basketno = $basket->{basketno};
836
839
837
    my $AcqViewBaskets = C4::Context->preference('AcqViewBaskets');
840
    my $AcqViewBaskets = C4::Context->preference('AcqViewBaskets');
Lines 843-849 sub CanUserManageBasket { Link Here
843
        my ($flags) = $sth->fetchrow_array;
846
        my ($flags) = $sth->fetchrow_array;
844
        $sth->finish;
847
        $sth->finish;
845
848
846
        $userflags = C4::Auth::getuserflags($flags, $borrower->userid, $dbh);
849
        $userflags = C4::Auth::getuserflags($flags, $borrower->{userid}, $dbh);
847
    }
850
    }
848
851
849
    unless ($userflags->{superlibrarian}
852
    unless ($userflags->{superlibrarian}
Lines 866-872 sub CanUserManageBasket { Link Here
866
        }
869
        }
867
870
868
        if ($AcqViewBaskets eq 'branch' && defined $basket->{branch}
871
        if ($AcqViewBaskets eq 'branch' && defined $basket->{branch}
869
        && $basket->{branch} ne $borrower->branchcode) {
872
        && $basket->{branch} ne $borrower->{branchcode}) {
870
            return 0;
873
            return 0;
871
        }
874
        }
872
    }
875
    }
873
- 

Return to bug 17829