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

fixed: Gallery navigation back to album returns to page 1

Browse source
This commit is contained in:
Martin Kamerbeek 2008-08-10 20:46:24 +00:00
parent cf060371a4
commit 4a13c10836
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ use base 'WebGUI::Asset::File';
use Carp qw( croak confess );
use URI::Escape;
use WebGUI::HTML;
use List::MoreUtils qw{ first_index };
=head1 NAME
@ -479,7 +479,8 @@ sub getTemplateVars {
}
# Add some things from Album
my $albumVar = $self->getParent->getTemplateVars;
my $album = $self->getParent;
my $albumVar = $album->getTemplateVars;
for my $key ( qw{ title menuTitle url thumbnailUrl } ) {
$var->{ "album_" . $key } = $albumVar->{ $key };
}
@ -490,6 +491,14 @@ sub getTemplateVars {
# Add a text-only synopsis
$var->{ synopsis_textonly } = WebGUI::HTML::filter( $self->get('synopsis'), "all" );
# Figure out on what page of the album the gallery file belongs.
my $fileIdsInAlbum = $album->getFileIds;
my $pageNumber =
int (
( first_index { $_ eq $self->getId } @{ $fileIdsInAlbum } ) # Get index of file in album
/ $album->getParent->get( 'defaultFilesPerPage' ) # Divide by the number of files per page
) + 1; # Round upwards
$var->{ canComment } = $self->canComment;
$var->{ canEdit } = $self->canEdit;
$var->{ numberOfComments } = scalar @{ $self->getCommentIds };
@ -500,7 +509,7 @@ sub getTemplateVars {
$var->{ url_demote } = $self->getUrl('func=demote');
$var->{ url_edit } = $self->getUrl('func=edit');
$var->{ url_gallery } = $self->getGallery->getUrl;
$var->{ url_album } = $self->getParent->getUrl;
$var->{ url_album } = $self->getParent->getUrl("pn=$pageNumber");
$var->{ url_thumbnails } = $self->getParent->getUrl('func=thumbnails');
$var->{ url_slideshow } = $self->getParent->getUrl('func=slideshow');
$var->{ url_makeShortcut } = $self->getUrl('func=makeShortcut');