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

added more vars to GalleryAlbum and GalleryFile. fixed some tests

Browse source
This commit is contained in:
Doug Bell 2008-04-17 22:54:19 +00:00
parent 5b16fcca51
commit 4ebed16c69
10 changed files with 148 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -389,6 +389,17 @@ sub getTemplateVars {
$var->{ $key } = $galleryVar->{ $key };
}
# More things from Gallery, but with different names
for my $key ( qw{ title menuTitle url } ) {
$var->{ "gallery_" . $key } = $galleryVar->{ $key };
}
# Add some things from Album
my $albumVar = $self->getParent->getTemplateVars;
for my $key ( qw{ title menuTitle url thumbnailUrl } ) {
$var->{ "album_" . $key } = $albumVar->{ $key };
}
# Add the search form
$self->getGallery->appendTemplateVarsSearchForm( $var );

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

@ -392,7 +392,7 @@ sub updateExifDataFromFile {
}
# Remove other, pointless keys
for my $key ( qw( directory ) ) {
for my $key ( qw( Directory ) ) {
delete $info->{ $key };
}

6
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
View file

@ -408,6 +408,12 @@ sub getTemplateVars {
$var->{ url_listFilesForCurrentUser } = $gallery->getUrl('func=listFilesForUser');
$var->{ url_search } = $gallery->getUrl('func=search');
# Add some specific vars from the Gallery
my $galleryVar = $gallery->getTemplateVars;
for my $key ( qw{ title menuTitle url } ) {
$var->{ "gallery_" . $key } = $galleryVar->{ $key };
}
# Friendly URLs
$var->{ url } = $self->getUrl;
$var->{ url_addArchive } = $self->getUrl('func=addArchive');