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 590d301b1..44b96eb1a 100644 Binary files a/docs/upgrades/packages-7.7.0/root_import_storymanager.wgpkg and b/docs/upgrades/packages-7.7.0/root_import_storymanager.wgpkg differ diff --git a/docs/upgrades/packages-7.7.0/root_import_storymanager_topicstorytemplate.wgpkg b/docs/upgrades/packages-7.7.0/root_import_storymanager_topicstorytemplate.wgpkg deleted file mode 100644 index 60b293e86..000000000 Binary files a/docs/upgrades/packages-7.7.0/root_import_storymanager_topicstorytemplate.wgpkg and /dev/null differ diff --git a/lib/WebGUI/Asset/Story.pm b/lib/WebGUI/Asset/Story.pm index 3d5d004a5..4fdbe6957 100644 --- a/lib/WebGUI/Asset/Story.pm +++ b/lib/WebGUI/Asset/Story.pm @@ -429,8 +429,15 @@ is passed, it will use that template instead. sub prepareView { my $self = shift; - my $templateId = shift || $self->getArchive->get('storyTemplateId'); $self->SUPER::prepareView(); + my $templateId; + my $topic = $self->topic; + if ($topic) { + $templateId = $topic->get('storyTemplateId'); + } + else { + $templateId = $self->getArchive->get('storyTemplateId'); + } my $template = WebGUI::Asset::Template->new($self->session, $templateId); $template->prepare; $self->{_viewTemplate} = $template; @@ -687,9 +694,10 @@ sub viewTemplateVariables { url => $archive->getUrl("func=view;keywords=".$session->url->escape($keyword)), }; } - ##TODO: publish time, calculated from revisionDate $var->{updatedTime} = $self->formatDuration(); $var->{updatedTimeEpoch} = $self->get('revisionDate'); + + $var->{crumb_loop} = $self->getCrumbTrail(); return $var; }