diff --git a/docs/upgrades/upgrade_7.7.2-7.7.3.pl b/docs/upgrades/upgrade_7.7.2-7.7.3.pl index 8a1ea12d2..1b2202a39 100644 --- a/docs/upgrades/upgrade_7.7.2-7.7.3.pl +++ b/docs/upgrades/upgrade_7.7.2-7.7.3.pl @@ -91,7 +91,6 @@ EOSTORY CREATE TABLE StoryArchive ( assetId CHAR(22) BINARY NOT NULL, revisionDate BIGINT NOT NULL, - storiesPerFeed INTEGER, storiesPerPage INTEGER, groupToPost CHAR(22) BINARY, templateId CHAR(22) BINARY, diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm index 2cc5290b3..ebd99a607 100644 --- a/lib/WebGUI/Asset/Wobject/StoryArchive.pm +++ b/lib/WebGUI/Asset/Wobject/StoryArchive.pm @@ -21,7 +21,8 @@ use WebGUI::Asset::Wobject::Folder; use WebGUI::Paginator; use WebGUI::Keyword; use WebGUI::Search; -use base 'WebGUI::Asset::Wobject'; +use Class::C3; +use base qw/WebGUI::AssetAspect::RssFeed WebGUI::Asset::Wobject/; use constant DATE_FORMAT => '%c_%D_%y'; @@ -84,13 +85,6 @@ sub definition { my %properties; tie %properties, 'Tie::IxHash'; %properties = ( - storiesPerFeed => { - tab => 'display', - fieldType => 'integer', - label => $i18n->get('stories per feed'), - hoverHelp => $i18n->get('stories per feed help'), - defaultValue => 25, - }, storiesPerPage => { tab => 'display', fieldType => 'integer', diff --git a/lib/WebGUI/Help/Asset_StoryArchive.pm b/lib/WebGUI/Help/Asset_StoryArchive.pm index 14fb73019..05ce64797 100644 --- a/lib/WebGUI/Help/Asset_StoryArchive.pm +++ b/lib/WebGUI/Help/Asset_StoryArchive.pm @@ -53,9 +53,6 @@ our $HELP = { ], fields => [], variables => [ - { 'name' => 'storesPerFeed', - 'description' => 'stories per feed help', - }, { 'name' => 'storesPerPage', 'description' => 'stories per page help', }, diff --git a/lib/WebGUI/i18n/English/Asset_StoryArchive.pm b/lib/WebGUI/i18n/English/Asset_StoryArchive.pm index 239f93ac4..760c4b015 100644 --- a/lib/WebGUI/i18n/English/Asset_StoryArchive.pm +++ b/lib/WebGUI/i18n/English/Asset_StoryArchive.pm @@ -9,18 +9,6 @@ our $I18N = { lastUpdated => 0 }, - 'stories per feed' => { - message => q|Stories Per Feed|, - context => q|Label in the edit screen and template.|, - lastUpdated => 0 - }, - - 'stories per feed help' => { - message => q|The number of stories displayed in RSS and Atom feeds from this StoryArchive.|, - context => q|Hoverhelp in the edit screen and template.|, - lastUpdated => 0 - }, - 'stories per page' => { message => q|Stories Per Page|, context => q|Label in the edit screen and template.|,