From fae20247f96929a71f96b054988dd9af9c8d5269 Mon Sep 17 00:00:00 2001 From: Matthew Wilson Date: Mon, 12 Dec 2005 06:40:57 +0000 Subject: [PATCH] - fix [ 1365822 ] makePrintable does not work in Collaboration System --- docs/changelog/6.x.x.txt | 2 ++ lib/WebGUI/Style.pm | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 5a1bf568f..a570dc030 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -6,6 +6,8 @@ - fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields - fix [ 1377276 ] Calendar Pop up issue - fix [ 1328728 ] Export exports root page n times + - fix +[ 1365822 ] makePrintable does not work in Collaboration System - fix [ 1376621 ] dateSubmitted not updated on posts - fix [ 1344111 ] promote/demote swap with non-"published" assets - fix [ 1372630 ] Syndicated encode "&" also if belong to a HTML entity diff --git a/lib/WebGUI/Style.pm b/lib/WebGUI/Style.pm index 21403470c..cd17e5e00 100644 --- a/lib/WebGUI/Style.pm +++ b/lib/WebGUI/Style.pm @@ -113,6 +113,12 @@ sub process { my $templateId = shift; if ($session{page}{makePrintable} && exists $session{asset}) { $templateId = $session{asset}->get("printableStyleTemplateId"); + my $currAsset = $session{asset}; + until ($templateId) { + # some assets don't have this property. But at least one ancestor should.... + $currAsset = $currAsset->getParent; + $templateId = $currAsset->get("printableStyleTemplateId"); + } } elsif ($session{scratch}{personalStyleId} ne "") { $templateId = $session{scratch}{personalStyleId}; } elsif ($session{page}{useEmptyStyle}) {