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

added template variables to photo. added better getParent and getGallery to GalleryFile, for approval processes

Browse source
This commit is contained in:
Doug Bell 2008-05-27 20:41:26 +00:00
parent be8ce29f57
commit 39c95cb25b
2 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -338,9 +338,45 @@ Gets the Gallery asset this GalleryFile is a member of.
sub getGallery {
my $self = shift;
my $gallery = $self->getParent->getParent;
return $gallery if $gallery->isa("WebGUI::Asset::Wobject::Gallery");
return undef;
# We're using getLinage instead of getParent->getParent because of the
# overridden getParent, below.
# We need to be able to get the Gallery WITHOUT having to get the GalleryAlbum
my $gallery
= $self->getLineage( ['ancestors'], {
includeOnlyClasses => [ 'WebGUI::Asset::Wobject::Gallery' ],
returnObjects => 1,
invertTree => 1,
} )->[ 0 ];
return $gallery;
}
#----------------------------------------------------------------------------
=head2 getParent ( )
Get the parent GalleryAlbum. If the only revision of the GalleryAlbum is
"pending", return that anyway.
=cut
sub getParent {
my $self = shift;
if ( my $album = $self->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 $album
= $self->getLineage( ['ancestors'], {
includeOnlyClasses => [ 'WebGUI::Asset::Wobject::GalleryAlbum' ],
returnObjects => 1,
statusToInclude => [ 'pending', 'approved' ],
invertTree => 1,
} )->[ 0 ];
return $album;
}
}
#----------------------------------------------------------------------------
@ -376,6 +412,11 @@ sub getTemplateVars {
$var->{ fileUrl } = $self->getFileUrl;
$var->{ thumbnailUrl } = $self->getThumbnailUrl;
# Set a flag for pending files
if ( $self->get( "status" ) eq "pending" ) {
$var->{ 'isPending' } = 1;
}
# Fix 'undef' vars since HTML::Template does inheritence on them
for my $key ( qw( synopsis ) ) {
unless ( defined $var->{$key} ) {

7
lib/WebGUI/Asset/File/GalleryFile/Photo.pm
View file

@ -224,9 +224,12 @@ sub getTemplateVars {
### Download resolutions
for my $resolution ( @{ $self->getResolutions } ) {
my $downloadUrl = $self->getStorageLocation->getPathFrag( $resolution );
push @{ $var->{ resolutions_loop } }, {
url_download => $self->getStorageLocation->getPathFrag($resolution)
resolution => $resolution,
url_download => $downloadUrl,
};
$var->{ "resolution_" . $resolution } = $downloadUrl;
}
### Format exif vars
@ -392,7 +395,7 @@ sub updateExifDataFromFile {
}
# Remove other, pointless keys
for my $key ( qw( Directory ) ) {
for my $key ( qw( Directory NativeDigest ) ) {
delete $info->{ $key };
}