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

Move template variable generation back into prepareView in the GalleryAlbum, so

Browse source 
that scripts are properly put into the HEAD block of a page.
This commit is contained in:
Colin Kuskie 2009-02-22 03:36:09 +00:00
parent 7684aa6e53
commit 9f10c3c693
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -5,6 +5,7 @@
- fixed defaultValues of undef cause mysql5.1 to complain about columns that are set to be NOT NULL. 5.0 doesn't care. - fixed defaultValues of undef cause mysql5.1 to complain about columns that are set to be NOT NULL. 5.0 doesn't care.
- International text retrieval has been optimized - International text retrieval has been optimized
- fixed #9766: Thingy Pagination Broken - fixed #9766: Thingy Pagination Broken
- fixed #9779: Gallery: js for search (datepicker?) included in album view
7.6.12 7.6.12
- fixed: During postback on a recurring transaction, the routine could error out instead of catching an error. - fixed: During postback on a recurring transaction, the routine could error out instead of catching an error.

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

@ -647,7 +647,8 @@ sub prepareView {
= WebGUI::Asset::Template->new($self->session, $templateId); = WebGUI::Asset::Template->new($self->session, $templateId);
$template->prepare($self->getMetaDataAsTemplateVariables); $template->prepare($self->getMetaDataAsTemplateVariables);
$self->{_viewTemplate} = $template; $self->{_viewTemplate} = $template;
$self->{_viewVariables} = $self->getTemplateVars;
} }
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -776,7 +777,7 @@ to be displayed within the page style.
sub view { sub view {
my $self = shift; my $self = shift;
my $session = $self->session; my $session = $self->session;
my $var = $self->getTemplateVars; my $var = delete $self->{_viewVariables};
my $p = $self->getFilePaginator; my $p = $self->getFilePaginator;
$p->appendTemplateVars( $var ); $p->appendTemplateVars( $var );