From 3e461decb9cf9e0a0d4a6d3d74c4d45c395cd9e4 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 20 Mar 2009 04:16:42 +0000 Subject: [PATCH] Add crumb trail template variable in code, and in templates. Remove standalone topic package, and update the main storymanager package. --- .../root_import_storymanager.wgpkg | Bin 2253 -> 2220 bytes ...port_storymanager_topicstorytemplate.wgpkg | Bin 1122 -> 0 bytes lib/WebGUI/Asset/Story.pm | 12 ++++++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) delete mode 100644 docs/upgrades/packages-7.7.0/root_import_storymanager_topicstorytemplate.wgpkg 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 590d301b1e2052ba85015a1a7c6a855ae076d737..44b96eb1aa76dba8cc3de93f985b7916cfe6ab2a 100644 GIT binary patch literal 2220 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'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; }