oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix an infinite loop with getting Photo under an album that is not committed. Fixes bug #11235.

Browse source
This commit is contained in:
Colin Kuskie 2009-12-18 08:22:34 -08:00
parent d45a58cf87
commit 8c0b73f2ec
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/WebGUI/Asset/File/GalleryFile.pm
View file

@ -204,7 +204,7 @@ sub canEdit {
my $album = $self->getParent;
return 1 if $userId eq $self->get("ownerUserId");
return $album->canEdit($userId);
return $album && $album->canEdit($userId);
}
#----------------------------------------------------------------------------
@ -239,7 +239,7 @@ sub canView {
my $userId = shift || $self->session->user->userId;
my $album = $self->getParent;
return 0 unless $album->canView($userId);
return 0 unless $album && $album->canView($userId);
if ($self->isFriendsOnly && $userId ne $self->get("ownerUserId") ) {
my $owner = WebGUI::User->new( $self->session, $self->get("ownerUserId") );
@ -416,7 +416,14 @@ sub getParent {
return $album;
}
# Only get the pending version if we're allowed to see this photo in its pending status
elsif ( $self->getGallery->canEdit || $self->get( 'ownerUserId' ) eq $self->session->user->userId ) {
my $gallery
= $self->getLineage( ['ancestors'], {
includeOnlyClasses => [ 'WebGUI::Asset::Wobject::Gallery' ],
returnObjects => 1,
statusToInclude => [ 'pending', 'approved' ],
invertTree => 1,
} )->[ 0 ];
if ( ($gallery && $gallery->canEdit) || $self->get( 'ownerUserId' ) eq $self->session->user->userId ) {
my $album
= $self->getLineage( ['ancestors'], {
includeOnlyClasses => [ 'WebGUI::Asset::Wobject::GalleryAlbum' ],
@ -426,6 +433,7 @@ sub getParent {
} )->[ 0 ];
return $album;
}
return undef;
}
#----------------------------------------------------------------------------