From e06d53c122993a810c9acbcfbe1d40cb7767fd20 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 19 Mar 2009 17:32:48 +0000 Subject: [PATCH] Add top story subtitle to match the spec. --- .../root_import_storymanager_storytopic.wgpkg | Bin 944 -> 942 bytes lib/WebGUI/Asset/Wobject/StoryTopic.pm | 1 + lib/WebGUI/Help/Asset_StoryTopic.pm | 1 + lib/WebGUI/i18n/English/Asset_StoryTopic.pm | 6 ++++++ t/Asset/Wobject/StoryTopic.t | 12 ++++++++++-- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/upgrades/packages-7.7.0/root_import_storymanager_storytopic.wgpkg b/docs/upgrades/packages-7.7.0/root_import_storymanager_storytopic.wgpkg index 991bf8a454220b4cc7012384b70066fc30b9ad1c..03ddf79517202f1391964afb72b17090ac1be046 100644 GIT binary patch literal 942 zcmV;f15x}RiwFP!00000|Ls*vZ`(K!_PM`8(0SLE{L@;mRi-M78 zi;YBbNy@HM^uKpFk}TDc_Y?y?ga^^)aAv;w=D~LB_{;OWAQ-e-b|3a}_xrFryXCcf z-yeDd&kwrYmgD=L-)lLba{QHPLli&@MZ);qVSkyXN*@;6;9y~Jxc|@9-${h1{pvgL z+h4Wdj|vg24~x7v<-gY-`g{5B4ZD8J0XC1nj+OuR@u5G4hwsmz30-Z3A}i`TW9OfL z|G*=ugrv$as_iLWvo{l>&8u%xC_|$eig=bJsA9#Tq68!_wpPjQxjO-LnL+!m%x)8= zV;WULPB+(#M`D9oUM0|5E~I7;{m^elkyA>d1zA0miVdgg3L5q-+Q*Tp1do&uro&Pj zNXJIMO$i4ERQ|^Z$-)W-(VCjV*32KS|NQjzdNz+gUa#k~6RikcRd<=bP{Iham3g?e zXqY}_QAGKElq)4Nc^18jm_bp$vSw&1lajd!aX3lo^Bb2%69a-TYoeS2-1NqESaeV} zopi|bhUaQ*>1e7o6TA%;+9XODf6u2AIjziwf*U0g4T^BwL3eCfHxV%n*tQF15;~p4 z-I}t=&pP(7NfoMrN3%q5Y7Itg?SxQR8qfptbDNGE*Gl5v6oQTwU4p2>R$jVN34~qu zTWA-UAmm90Y=EVDXr=l*yDfoAd#3|HaIXbh$A)!s&a}zFW#GIZG!a5NDE?x9+Vg}p zLWla>gIrK$p@NQuf$mE?o!kv#tLlRBm?~y~fY(Z-7erB>*G{e6;60;7Q@hoG_i)$` z{K^)#=1ENWs;O}?G4G)4ur#mf?cY~ttAVV{cs_O)2FWR?|UDk|>xoC_cc>czn8ed;X9srq4xqSCanA9A)|? zU6L%xlUj?To-Fh^8U>@#An4XuP;|{~bH6MHM^g@9PLc3#S07adbSyS!{IyVN&PmO= zojzKUFekAoL6nDTE6qiNT|-vo2)&=j!~gXBP5kDP&o29Ee4;;ZDg;c=w;Cp2Lw51y zY059gTvF-QFyo8#kc?h;G^#v84xxbxco#3QSg>VwpRQ|P#UIapJjSE@WaEi}CkCDv Q_zf8N33X)90RRvH0Pexj1poj5 literal 944 zcmV;h15f-PiwFP!00000|Ls-ZZ`wW(=Xrlcl;;hS5SlNDA+fF-eARB9pzEe}n%u-B z9>I=m2g;`X?>k=t$=a}|BJH7mz`^JH+}-DXxZOJbavUcJdaah(Pkh{6A9icMoR;gl zCypNke$Q!HuIqTcmIW%uU%Apmf@`5j8DAc@mn$mOVX+Ag76ym=U#|X3BJ|p=etX5Y z-~O%yeWgtpQ`l9<}o!20s_ zIUZ$FWK?QKl{v+0=4MKiKD*0=)HE8Si05gFDn=YiN5SPHxc=4U1yH@1-^-4O(xNV)(~<=gJkl}sV* zy4_N{^a(;9b^rsAI$#9%S|D}1SOe!w>B4Xhz$IC!5SfMIZ|2jSr>xN}sI7bMlr$JO zK*zX&=65)q!VLOW<(%<^N~R&WH&U!FiKM)!i&`ncTSd!;wX5On;PBp!@Cp%|?=&Gi z-nVA0C6M}eP*_-e*Yx)7)pRfzo0=aC=DPyice0rP7b0Q{1}%(T?sWtIzpmHsR~E~X z{>W(2(?KP|+CW82^!(3OQ%jb;6B^J%qM<_;I8{8|^8 z_;VZ+HpyVHt?R>QMR|_(a?q!YNSGxkKETdkFqvPRKjez3a}h3gr2jD~nR-nZBu^it zww^4s+3yGaelPH9EJ(U$rhQ-UMuXds1DHf4T<)u+%79A5X3F0PxhgoRk!a?N%1Bs{ z*pwj3L%GfLWdp7zaXBQ{!SZx5y}X!w@Xn^mRC;Iq9~Ya-1EywM1+%RoyZE*==6zx-d1?;@oGna6Vx+veT-_3YPUJgZL_PYgUU S@WjAB&%kfUaQUnN5C8yGcG-Ra diff --git a/lib/WebGUI/Asset/Wobject/StoryTopic.pm b/lib/WebGUI/Asset/Wobject/StoryTopic.pm index 35cb20b23..035f30b7b 100644 --- a/lib/WebGUI/Asset/Wobject/StoryTopic.pm +++ b/lib/WebGUI/Asset/Wobject/StoryTopic.pm @@ -168,6 +168,7 @@ sub viewTemplateVariables { ##Note, this could have saved from the loop above, but this looks more clean and encapsulated to me. my $topStory = WebGUI::Asset->new($session, $topStoryData->{assetId}, $topStoryData->{className}, $topStoryData->{revisionDate}); $var->{topStoryTitle} = $topStory->getTitle; + $var->{topStorySubtitle} = $topStory->get('subtitle'); $var->{topStoryUrl} = $session->url->append($self->getUrl, 'func=viewStory;assetId='.$topStoryData->{assetId}), $var->{topStoryCreationDate} = $topStory->get('creationDate'); ##TODO: Photo variables diff --git a/lib/WebGUI/Help/Asset_StoryTopic.pm b/lib/WebGUI/Help/Asset_StoryTopic.pm index e5418a4b0..dc1e7bf0b 100644 --- a/lib/WebGUI/Help/Asset_StoryTopic.pm +++ b/lib/WebGUI/Help/Asset_StoryTopic.pm @@ -28,6 +28,7 @@ our $HELP = { ], }, { name => 'topStoryTitle' }, + { name => 'topStorySubtitle' }, { name => 'topStoryUrl' }, { name => 'topStoryCreationDate' }, ], diff --git a/lib/WebGUI/i18n/English/Asset_StoryTopic.pm b/lib/WebGUI/i18n/English/Asset_StoryTopic.pm index 574e24037..de29aa089 100644 --- a/lib/WebGUI/i18n/English/Asset_StoryTopic.pm +++ b/lib/WebGUI/i18n/English/Asset_StoryTopic.pm @@ -93,6 +93,12 @@ our $I18N = { lastUpdated => 0, }, + 'topStorySubtitle' => { + message => q|The subtitle of the top story.|, + context => q|Template variable.|, + lastUpdated => 0, + }, + 'topStoryCreationDate' => { message => q|The epoch date when the top story was created, or submitted, to its Story Archive.|, context => q|Template variable.|, diff --git a/t/Asset/Wobject/StoryTopic.t b/t/Asset/Wobject/StoryTopic.t index d7e3c093e..342c97ddc 100644 --- a/t/Asset/Wobject/StoryTopic.t +++ b/t/Asset/Wobject/StoryTopic.t @@ -31,7 +31,7 @@ my $session = WebGUI::Test->session; #---------------------------------------------------------------------------- # Tests -my $tests = 10; +my $tests = 11; plan tests => 1 + $tests; #---------------------------------------------------------------------------- @@ -69,6 +69,8 @@ STORY: foreach my $name (@characters) { $creationDateSth->execute([$now, $namedStory->getId]); } +$storyHandler->{bogs}->update({subtitle => 'drinking his food through a straw'}); + my $topic; SKIP: { @@ -116,7 +118,8 @@ cmp_deeply( ok( ! exists $templateVars->{topStoryTitle} && ! exists $templateVars->{topStoryUrl} - && ! exists $templateVars->{topStoryCreationDate}, + && ! exists $templateVars->{topStoryCreationDate} + && ! exists $templateVars->{topStorySubtitle}, 'topStory variables not present unless in standalone mode' ); ok(! $templateVars->{standAlone}, 'viewTemplateVars: not in standalone mode'); @@ -156,6 +159,11 @@ cmp_deeply( ); is($templateVars->{topStoryTitle}, 'bogs', 'viewTemplateVars in standalone mode, title'); +is( + $templateVars->{topStorySubtitle}, + 'drinking his food through a straw', + 'viewTemplateVars in standalone mode, subtitle' +); is( $templateVars->{topStoryUrl}, $session->url->append($topic->getUrl, 'func=viewStory;assetId='.$storyHandler->{'bogs'}->getId),