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

Make sure that the keywords template variable is provided by processTemplate, since we documented that it does that. Fixes bug #12186.

Browse source
This commit is contained in:
Colin Kuskie 2011-07-10 18:29:52 -07:00
parent 200b4c3ec7
commit 87d252ec26
3 changed files with 58 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
- fixed #12165: Default date in Thingy doesn't work
- fixed #12188: Thingy broken after upgrade to 7.9.32-stable
- fixed #12184: Apache error in modperl.error.log (William McKee, Knowmad Technologies)
- fixed #12186: keywords template variable not working properly in Article
7.10.19
- fixed #12169: extras uploads symlink export

1
lib/WebGUI/Asset.pm
View file

@ -2485,6 +2485,7 @@ sub processTemplate {
%{$self->{_properties}},
'title' => $self->getTitle,
'menuTitle' => $self->getMenuTitle,
'keywords' => $self->get('keywords'),
%{$var},
);
return $template->process(\%vars);

56
t/Asset/processTemplate.t Normal file
View file

@ -0,0 +1,56 @@
#-------------------------------------------------------------------
# WebGUI is Copyright 2001-2009 Plain Black Corporation.
#-------------------------------------------------------------------
# Please read the legal notices (docs/legal.txt) and the license
# (docs/license.txt) that came with this distribution before using
# this software.
#-------------------------------------------------------------------
# http://www.plainblack.com info@plainblack.com
#-------------------------------------------------------------------
use FindBin;
use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use WebGUI::Asset;
use Test::More;
use Test::Deep;
use Clone qw/clone/;
plan tests => 1;
my $session = WebGUI::Test->session;
##Set the maximum assets to 5
WebGUI::Test->originalConfig('maximumAssets');
$session->config->set('maximumAssets', 5);
my $rootAsset = WebGUI::Asset->getRoot($session);
my $versionTag = WebGUI::VersionTag->getWorking($session);
WebGUI::Test->addToCleanup($versionTag);
$rootAsset->addRevision({keywords => 'one,two,three,four'});
$versionTag->commit;
$rootAsset = $rootAsset->cloneFromDb;
##Override the user function style template so we can examine its output easily
#1234567890123456789012#
my $templateId = 'USER_STYLE_OVERRIDE___';
my $templateMock = Test::MockObject->new({});
$templateMock->set_isa('WebGUI::Asset::Template');
$templateMock->set_always('getId', $templateId);
my $templateVars;
$templateMock->mock('process', sub { $templateVars = clone($_[1]); } );
{
WebGUI::Test->mockAssetId($templateId, $templateMock);
$rootAsset->processTemplate({}, $templateId);
use WebGUI::Keyword;
my $keywords = WebGUI::Keyword::string2list($templateVars->{keywords});
cmp_bag($keywords, [qw/one two three four/], 'Keywords are available when running processTemplate');
}