From 6844ef4559442c25430d4af1623c482763470cee Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 1 Jun 2009 16:27:49 +0000 Subject: [PATCH] Add missing edit story and delete story icons in the view method of the Story Archive. --- docs/changelog/7.x.x.txt | 1 + .../root_import_storymanager.wgpkg | Bin 0 -> 4778 bytes lib/WebGUI/Asset/Wobject/StoryArchive.pm | 20 +++++++++++++++--- lib/WebGUI/Help/Asset_StoryArchive.pm | 2 ++ lib/WebGUI/i18n/English/Asset_StoryArchive.pm | 12 +++++++++++ 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 docs/upgrades/packages-7.7.9/root_import_storymanager.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 910672e32..47e0e1c79 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -6,6 +6,7 @@ - fixed #10361: Shortcuts duplicate extra header tags - fixed #10356: SQL report is cached too long - fixed #10313: extra head elements appear twice + - fixed missing edit story and delete story icons in the Story Manager. 7.7.8 - fixed: Basic Auth doesn't work if password contains colon (Arjan Widlak, diff --git a/docs/upgrades/packages-7.7.9/root_import_storymanager.wgpkg b/docs/upgrades/packages-7.7.9/root_import_storymanager.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..a32213b8070418baebe8eae921b4cfbb276e8431 GIT binary patch literal 4778 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 E092S?VgLXD literal 0 HcmV?d00001 diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm index 6ee016627..9bf1b14b5 100644 --- a/lib/WebGUI/Asset/Wobject/StoryArchive.pm +++ b/lib/WebGUI/Asset/Wobject/StoryArchive.pm @@ -481,7 +481,8 @@ sub viewTemplateVariables { my $query = $session->form->get('query'); my $exporting = $session->scratch->get('isExporting'); my $p; - my $var = $self->get(); + my $i18n = WebGUI::International->new($session); + my $var = $self->get(); if ($mode eq 'keyword') { $var->{mode} = 'keyword'; my $wordList = WebGUI::Keyword::string2list($keywords); @@ -524,9 +525,15 @@ sub viewTemplateVariables { ##Pagination variables aren't useful in export mode $p->appendTemplateVars($var); } + $var->{date_loop} = []; my $lastStoryDate = ''; - my $datePointer = undef; + my $datePointer = undef; + + my $icon = $session->icon; + my $userUiLevel = $session->user->profileField("uiLevel"); + my $uiLevels = $session->config->get('assetToolbarUiLevel'); + ##Only build objects for the assets that we need STORY: foreach my $storyId (@{ $storyIds }) { my $story = WebGUI::Asset->new($session, $storyId->{assetId}, $storyId->{className}, $storyId->{revisionDate}); @@ -541,11 +548,18 @@ sub viewTemplateVariables { $datePointer->{story_loop} = []; $lastStoryDate = $storyDate; } - push @{$datePointer->{story_loop}}, { + my $storyVars = { url => $story->getUrl, title => $story->getTitle, creationDate => $creationDate, + }; + if ($userUiLevel >= $uiLevels->{delete}) { + $storyVars->{deleteIcon} = $icon->delete('func=delete', $story->get('url'), $i18n->get(43)); } + if ($userUiLevel >= $uiLevels->{edit}) { + $storyVars->{editIcon} = $icon->edit('func=edit', $story->get('url')); + } + push @{$datePointer->{story_loop}}, $storyVars; } $var->{canPostStories} = $self->canPostStories; diff --git a/lib/WebGUI/Help/Asset_StoryArchive.pm b/lib/WebGUI/Help/Asset_StoryArchive.pm index ed3aa84e4..20eb49f4f 100644 --- a/lib/WebGUI/Help/Asset_StoryArchive.pm +++ b/lib/WebGUI/Help/Asset_StoryArchive.pm @@ -30,6 +30,8 @@ our $HELP = { { 'name' => 'url' }, { 'name' => 'title' }, { 'name' => 'creationDate' }, + { 'name' => 'deleteIcon' }, + { 'name' => 'editIcon' }, ], }, ] diff --git a/lib/WebGUI/i18n/English/Asset_StoryArchive.pm b/lib/WebGUI/i18n/English/Asset_StoryArchive.pm index 21531acfc..3a1fe006c 100644 --- a/lib/WebGUI/i18n/English/Asset_StoryArchive.pm +++ b/lib/WebGUI/i18n/English/Asset_StoryArchive.pm @@ -213,6 +213,18 @@ our $I18N = { lastUpdated => 0, }, + 'deleteIcon' => { + message => q|An icon to delete this story.|, + context => q|Template variable.|, + lastUpdated => 0, + }, + + 'editIcon' => { + message => q|An icon to edit this story.|, + context => q|Template variable.|, + lastUpdated => 0, + }, + 'add a story' => { message => q|Add a Story.|, context => q|label for the URL to add a story to the archive.|,