From 3d5f5b04c1f002e66a3801560940d8f2ec65ada8 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 20 Mar 2009 21:42:47 +0000
Subject: [PATCH] Rearrange form fields in default edit story template. Change
 photo JSON blob to be an array ref, not a hash ref. Code for saving new photo
 data.

---
 .../root_import_storymanager.wgpkg            | Bin 2737 -> 2583 bytes
 lib/WebGUI/Asset/Story.pm                     |  10 +++---
 lib/WebGUI/i18n/English/Asset_Story.pm        |  30 ++++++++++++++++++
 t/Asset/Story.t                               |  24 +++++++-------
 4 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/docs/upgrades/packages-7.7.0/root_import_storymanager.wgpkg b/docs/upgrades/packages-7.7.0/root_import_storymanager.wgpkg
index f0afef65e6d0f87d974e1d8939d1e2fa08eeee10..ca8add516ee98165518bf7d244ee84bc7b1eb401 100644
GIT binary patch
literal 2583
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

literal 2737
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

diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm
index 7db6d342f..228f4868f 100644
--- a/lib/WebGUI/Asset/Story.pm
+++ b/lib/WebGUI/Asset/Story.pm
@@ -145,7 +145,7 @@ sub definition {
         },
         photo => {
             fieldType    => 'text',
-            defaultValue => '{}',
+            defaultValue => '[]',
         },
         storageId => {
             fieldType    => 'hidden',
@@ -249,7 +249,6 @@ sub getAutoCommitWorkflowId {
 	my $self    = shift;
     my $archive = $self->getArchive;
     if ($archive->hasBeenCommitted) {
-        $self->session->log->warn($archive->get('approvalWorkflowId'));
         return $archive->get('approvalWorkflowId')
             || $self->session->setting->get('defaultVersionTagWorkflow');
     }
@@ -490,6 +489,7 @@ sub processPropertiesFromFormPost {
     if ($newStorage) {
         push @{ $photoData }, {
             caption   => $form->process('newImgCaption', 'text'),
+            alt       => $form->process('newImgAlt',     'text'),
             title     => $form->process('newImgTitle',   'text'),
             byLine    => $form->process('newImgByline',  'text'),
             url       => $form->process('newImgUrl',     'url'),
@@ -538,9 +538,7 @@ sub purgeRevision {
 
 =head2 setPhotoData ( $perlStructure )
 
-Returns the storage location for this Story.  If it does not exist,
-then it creates it via setStorageLocation.  Subsequent lookups return
-an internally cached Storage object to save time.
+Sets the photo data from the JSON stored in the object.
 
 =head3 $perlStructure
 
@@ -577,7 +575,7 @@ want in there so there's no valid content checking.
 
 sub setPhotoData {
 	my $self      = shift;
-    my $photoData = shift || {};
+    my $photoData = shift || [];
     my $photo     = to_json($photoData);
     $self->update({photo => $photo});
     delete $self->{_photoData};
diff --git a/lib/WebGUI/i18n/English/Asset_Story.pm b/lib/WebGUI/i18n/English/Asset_Story.pm
index 051ce9755..f23de7694 100644
--- a/lib/WebGUI/i18n/English/Asset_Story.pm
+++ b/lib/WebGUI/i18n/English/Asset_Story.pm
@@ -344,6 +344,36 @@ our $I18N = {
         lastUpdated => 0,
     },
 
+    'photo caption' => {
+        message => q|Photo Caption|,
+        context => q|Label in the edit story form.  Short for Photograph Caption.|,
+        lastUpdated => 0,
+    },
+
+    'photo byline' => {
+        message => q|Photo By Line|,
+        context => q|Label in the edit story form.  The person who took, or owns this photo.|,
+        lastUpdated => 0,
+    },
+
+    'photo alt' => {
+        message => q|Photo Alternate Text|,
+        context => q|Label in the edit story form.  Text for the ALT attribute of an IMG tag.|,
+        lastUpdated => 0,
+    },
+
+    'photo title' => {
+        message => q|Photo Alternate Title|,
+        context => q|Label in the edit story form.  Text for the TITLE attribute of an IMG tag.|,
+        lastUpdated => 0,
+    },
+
+    'photo url' => {
+        message => q|Photo URL|,
+        context => q|Label in the edit story form.  A link from the photo to more information about it, or referring to it.|,
+        lastUpdated => 0,
+    },
+
 };
 
 1;
diff --git a/t/Asset/Story.t b/t/Asset/Story.t
index 0325e1fb5..635828a4a 100644
--- a/t/Asset/Story.t
+++ b/t/Asset/Story.t
@@ -81,7 +81,7 @@ $story = $archive->addChild({
 
 isa_ok($story, 'WebGUI::Asset::Story', 'Created a Story asset');
 is($story->get('storageId'), '', 'by default, there is no storageId');
-is($story->get('photo'),   '{}', 'by default, photos is an empty JSON hash');
+is($story->get('photo'),   '[]', 'by default, photos is an empty JSON array');
 is($story->get('isHidden'), 1, 'by default, stories are hidden');
 $story->update({isHidden => 0});
 is($story->get('isHidden'), 1, 'stories cannot be set to not be hidden');
@@ -111,36 +111,36 @@ is($story->getArchive->getId, $archive->getId, 'getArchive gets the parent archi
 
 my $photoData = $story->getPhotoData();
 cmp_deeply(
-    $photoData, {},
-    'getPhotoData: returns an empty hash with no JSON data'
+    $photoData, [],
+    'getPhotoData: returns an empty array ref with no JSON data'
 );
 
-$story->setPhotoData({
-    filename1 => {
+$story->setPhotoData([
+    {
         byLine  => 'Andrew Dufresne',
         caption => 'Shawshank Prison',
     },
-});
+]);
 
-is($story->get('photo'), q|{"filename1":{"caption":"Shawshank Prison","byLine":"Andrew Dufresne"}}|, 'setPhotoData: set JSON in the photo property');
+is($story->get('photo'), q|[{"caption":"Shawshank Prison","byLine":"Andrew Dufresne"}]|, 'setPhotoData: set JSON in the photo property');
 
 $photoData = $story->getPhotoData();
-$photoData->{filename1}->{caption}="My cell";
+$photoData->[0]->{caption}="My cell";
 
 cmp_deeply(
     $story->getPhotoData,
-    {
-        filename1 => {
+    [
+        {
             byLine  => 'Andrew Dufresne',
             caption => 'Shawshank Prison',
         },
-    },
+    ],
     'getPhotoData does not return an unsafe reference'
 );
 
 $story->setPhotoData();
 cmp_deeply(
-    $story->getPhotoData, {},
+    $story->getPhotoData, [],
     'setPhotoData: wipes the stored data if nothing is passed'
 );