From ef6e78fc275bed149eb3dec32d01a9ad280a2ea6 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 9 Sep 2010 11:56:50 -0700
Subject: [PATCH] topStory template variables should be available in standAlone
 and not standAlone modes.  Added template variables for delete and edit icons
 for the top story.  Updated the tests, template and template variable help. 
 Fixes bug #11851.

---
 docs/changelog/7.x.x.txt                      |   1 +
 docs/templates.txt                            |  12 +++++++
 .../root_import_storymanager_storytopic.wgpkg | Bin 0 -> 1411 bytes
 lib/WebGUI/Asset/Wobject/StoryTopic.pm        |   6 ++--
 lib/WebGUI/Help/Asset_StoryTopic.pm           |   4 +++
 t/Asset/Wobject/StoryTopic.t                  |  32 ++++++++----------
 6 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 docs/upgrades/packages-7.10.1/root_import_storymanager_storytopic.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 67741e6eb..64f26cca0 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.10.1
+ - fixed #11851: Story Topic: top story variables should be available all the time
 
 7.10.0
  - fixed #11812: Checking www_ajaxSave's response in the cart js, urlencoding post parameters
diff --git a/docs/templates.txt b/docs/templates.txt
index 85f3e7cad..921d98dd5 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -25,3 +25,15 @@ templates, you will need to apply these changes manually to your copies.
     }
     Gallery.DDSorting.url = '<tmpl_var url escape="js">';
 
+  *  Story Topic Template
+     Since topStory template variables are available all the time, manually add the topStory into the list of
+     stories when the topic is no viewed standalone.  Also note the new template variables for the the delete
+     and edit icons for the top story.
+
+     <ul>
+     <tmpl_unless standAlone>
+     <li><tmpl_var topStoryDeleteIcon><tmpl_var topStoryEditIcon> <a href="<tmpl_var topStoryUrl>"><tmpl_var topStoryTitle></a></li>
+     </tmpl_unless>
+     <tmpl_loop story_loop>
+
+
diff --git a/docs/upgrades/packages-7.10.1/root_import_storymanager_storytopic.wgpkg b/docs/upgrades/packages-7.10.1/root_import_storymanager_storytopic.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..bfd1d466eb6c612b7207a289af80f29703f3b8d4
GIT binary patch
literal 1411
zcmV-}1$_D+iwFP!00000|Ls>>Pa`)J&NIJanulsv0x}5+10ju+g=NW#TbEE4l`b+f
zPU2-^k8DpMt@gk79M8=O6Z!zDDwRBt;Nv-$@A!P5XS1^UkL$Xg*Q!)px9+uE{C4Zj
zW~JifAGcD6l}4kn?KQoMQ?I*?R>grwR{x2WCK6KeMacO5@_4bLQY|-QQSdRvneS(|
z{+CQ9>w59G*)YFbo8Oh-uaqcw+}?(MFX_M6@U|BE-`sMc|A6M|Kdb8h=IT>_jR=3O
z!4OuJ7Ltr;)oDAw|FLeCA}Jy&HKPhw%{JWWOG-2iKFn~nx>Yrs(GU`)KR!l6g0*L!
z;c*z|<}^Y-`1nXBQD{OfYyiK;X%yduOpR$!IOp`?it#`^m<?`WP%|zf#h%8ak6Mx=
zN`e6ysdM7rgFDQ)gH!H|B^~~9Q~g$Zhk4B=ghTam(^u;K-c8k!Gz6>Cvyeg_RKt><
zMHJRF_^rV<SgCc3G{gg^@)8)LpG2{6nM-7aDG;ToPQ&-=+tZEf?^nHx@z<;AMQ>k8
zLPtfqu?$TnQV3mR6Kq<|1|s=Ki-`HfLrfj9AfSA)1x%ewp#=i8Xc|coN6_+sX=7>@
z-ZX_%kafHhu&KiWgE_QgfPp(2Hr!5$bkfSYfVmH+OwDb(sdjI8hd7)}us<v)ea`qU
zw{<%;f-X!rHgptKiV406kvB;&Vf>7DJ5jfA>kF=>2o*dC%eC}5+eN?>)HWM19a30F
zmFtYREEn2XIyG2?$hM0pFL6j|0LQEgwWX)ENI@!fDMJ9H`>oG4m7HiunS}4auzp4F
zK3(?T?_pie&v!6{dj_E=UWgWx)J+e5;(jbC!vdiXsPZL?(0jg)7-_<TUMM)0XPTEa
z2F}a{PE^vCanmk3H6759YT5@FON@9_jL9jhJM*4qT>z3963CNEAUGsvcP`s?5#MDU
zFy+?Z_~Bl=5&3agTB;eCW2S%|a%^a*o<NfC`@lxYRy$4%ZRANIF$cO)3*d&V1f_oq
zLI|G2l4O@B8wwFYs?h3N{E6#xsRm_Trq6a4SP74`)zx%N@LbxdWC63jnO;3b4||^v
z4^VyK7$YIkFOJU_&<kfGBsG<R^sV=hRd3Ca9v~|vV`WW#0Sj_iHU<x)4L_trVmVos
z=G*D~w6Q^XkU(c#ZfsaW!uXg<rs04eN-;SnlJbN)EzKiZ6MsAbi~0<gG-TGNO1eKL
zd{nB_jMG%=tHrg?HCMpw@>kHbDd-fq)$n&hE$y~JrQIH69G<H@UII=;z=kZ9+j?WC
z>9%&7O`H0$t;S!0YY{QkjNced#NI1ROd&mxyY%ULVNv%iIu#n?`i2UPcgqf7#fBS}
zh6PH~vAIT6Nd$MFseS!03UtB#OtNk?n>$75h)B@==iq6#j|L~lPr+j9Sm3=Rxl7Hp
zkf{SYBypJZ-YNvsq-k$W%-vmYcemv=tn(r1l%a$jWb#_p1W;|b6y*n@s7H;(L!TcC
zIZ4p4g2O9Na+AvLRVD)~GK#Q@h`+qMne5v)vKNUz>cq>m-${7k1=628m=pe`l3(ad
zXEkzPs+~*JKF{6K^ks_PK|RkIwV=~XSAn$_2t1X1GkU;;NaX0_A4NGKO$(?JIiAZh
z7uj4uj1-seNrc$)4kDaXv#4q-*R(VVqiAW-&+16Br<hjCeL0KtdC4GaGD=?u=xF+N
zd;c*CuTQ+zm&0Gr&aO{&uW-WD#Z19uE{?Myl8m3K77+jun>W2ODmE{O^X#*=yIbG!
z>K0J|X@Y#E=?%rh(QtHj|5^7Q1EoC~j|ReiTghlA%@1Esf2{pjdyUuMHy>{Zydm(0
R!2cG3zX7*xI#~c1008H$t8V}R

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/StoryTopic.pm b/lib/WebGUI/Asset/Wobject/StoryTopic.pm
index 154d8c96c..62aaf508c 100644
--- a/lib/WebGUI/Asset/Wobject/StoryTopic.pm
+++ b/lib/WebGUI/Asset/Wobject/StoryTopic.pm
@@ -198,15 +198,17 @@ sub viewTemplateVariables {
         push @{$var->{story_loop}}, $storyVars;
     }
 
-    if ($self->{_standAlone} and @$storyIds) {
+    if (@{ $storyIds }) {
         my $topStoryData = $storyIds->[0];
-        shift @{ $var->{story_loop} };
+        my $topStoryVars = shift @{ $var->{story_loop} };
         ##Note, this could have saved from the loop above, but this looks more clean and encapsulated to me.
         my $topStory   = WebGUI::Asset->newById($session, $topStoryData->{assetId}, $topStoryData->{revisionDate});
         $var->{topStoryTitle}          = $topStory->getTitle;
         $var->{topStorySubtitle}       = $topStory->subtitle;
         $var->{topStoryUrl}            = $session->url->append($self->getUrl, 'func=viewStory;assetId='.$topStoryData->{assetId}),
         $var->{topStoryCreationDate}   = $topStory->creationDate;
+        $var->{topStoryEditIcon}       = $topStoryVars->{editIcon};
+        $var->{topStoryDeleteIcon}     = $topStoryVars->{deleteIcon};
         ##TODO: Photo variables
         my $photoData = $topStory->getPhotoData;
         PHOTO: foreach my $photo (@{ $photoData }) {
diff --git a/lib/WebGUI/Help/Asset_StoryTopic.pm b/lib/WebGUI/Help/Asset_StoryTopic.pm
index 510c6d4a1..6bd21e027 100644
--- a/lib/WebGUI/Help/Asset_StoryTopic.pm
+++ b/lib/WebGUI/Help/Asset_StoryTopic.pm
@@ -29,6 +29,10 @@ our $HELP = {
                 { name => 'editIcon' },
               ],
             },
+            { name => 'topStoryDeleteIcon',
+              description => 'deleteIcon', },
+            { name => 'topStoryEditIcon'
+              description => 'editIcon', },
             { name => 'topStoryTitle'        },
             { name => 'topStorySubtitle'     },
             { name => 'topStoryUrl'          },
diff --git a/t/Asset/Wobject/StoryTopic.t b/t/Asset/Wobject/StoryTopic.t
index e88aaf749..f4c7f224f 100644
--- a/t/Asset/Wobject/StoryTopic.t
+++ b/t/Asset/Wobject/StoryTopic.t
@@ -111,11 +111,6 @@ cmp_deeply(
 cmp_deeply(
     $templateVars->{story_loop},
     [
-        {
-            title        => 'bogs',
-            url          => $session->url->append($topic->getUrl, 'func=viewStory;assetId='.$storyHandler->{'bogs'}->getId),
-            creationDate => $now,
-        },
         {
             title        => 'red',
             url          => $session->url->append($topic->getUrl, 'func=viewStory;assetId='.$storyHandler->{'red'}->getId),
@@ -131,11 +126,11 @@ cmp_deeply(
 );
 
 ok(
-    ! exists $templateVars->{topStoryTitle}
- && ! exists $templateVars->{topStoryUrl}
- && ! exists $templateVars->{topStoryCreationDate}
- && ! exists $templateVars->{topStorySubtitle},
-    'topStory variables not present unless in standalone mode'
+    exists $templateVars->{topStoryTitle}
+ && exists $templateVars->{topStoryUrl}
+ && exists $templateVars->{topStoryCreationDate}
+ && exists $templateVars->{topStorySubtitle},
+    'topStory variables present in standalone mode'
 );
 ok(! $templateVars->{standAlone}, 'viewTemplateVars: not in standalone mode');
 
@@ -234,8 +229,9 @@ $topic->update({
 
 $topic->{_standAlone} = 0;
 
-$templateVars = $topic->viewTemplateVariables;
+$templateVars    = $topic->viewTemplateVariables;
 my @topicInmates = map { $_->{title} } @{ $templateVars->{story_loop} };
+unshift @topicInmates, $templateVars->{topStoryTitle};
 cmp_deeply(
     \@topicInmates,
     [@inmates, 'Yesterday is history'], #extra for pastStory
@@ -250,11 +246,6 @@ $templateVars = $topic->viewTemplateVariables;
 cmp_deeply(
     $templateVars->{story_loop},
     [
-        {
-            title        => 'bogs',
-            url          => $storyHandler->{'bogs'}->getUrl,
-            creationDate => $now,
-        },
         {
             title        => 'red',
             url          => $storyHandler->{'red'}->getUrl,
@@ -336,7 +327,14 @@ $topic->update( { storySortOrder => 'Alphabetically' } );
 $templateVars = $topic->viewTemplateVariables();
 
 cmp_deeply(
-    $templateVars->{story_loop},
+    [
+        {
+            title        => $templateVars->{topStoryTitle},
+            url          => $templateVars->{topStoryUrl},
+            creationDate => $templateVars->{topStoryCreationDate},
+        },
+        @{ $templateVars->{story_loop} },
+    ],
     [
         {
             title        => "aaaay was history but isn't any more",