Bug 6824 - correctly check basket viewing permissions

Previously you couldn't view baskets that you hadn't created, unless you
were superlibrarian due to a bug. Now people with the right permissions
can see the baskets.

Applies to both 3.04.04 and master.

Signed-off-by: Brendan <info@bywatersolutions.com>
Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9966d218ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit is contained in:
Robin Sheat 2011-08-31 15:22:38 +12:00 committed by Chris Nighswonger
parent 23d97c608c
commit 9a11fda019
2 changed files with 2 additions and 2 deletions

View File

@ -197,7 +197,7 @@ if ( $op eq 'delete_confirm' ) {
#if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups
my $basketgroups;
my $member = GetMember(borrowernumber => $loggedinuser);
if ($basket->{closedate} && haspermission({ flagsrequired => { acquisition => 'group_manage'} })) {
if ($basket->{closedate} && haspermission({ acquisition => 'group_manage'} )) {
$basketgroups = GetBasketgroups($basket->{booksellerid});
for my $bg ( @{$basketgroups} ) {
if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){

View File

@ -106,7 +106,7 @@ for my $vendor (@suppliers) {
if (( $basket->{authorisedby}
&& $basket->{authorisedby} eq $loggedinuser
)
|| haspermission( $uid, { flagsrequired => { acquisition => q{*} } } )
|| haspermission( $uid, { acquisition => q{*} } )
) {
for my $date_field (qw( creationdate closedate)) {
if ( $basket->{$date_field} ) {