oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- fix

Browse source 
[ 1365822 ] makePrintable does not work in Collaboration System
This commit is contained in:
Matthew Wilson 2005-12-12 06:40:57 +00:00
parent d7ebf75b71
commit fae20247f9
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/6.x.x.txt
View file

@ -6,6 +6,8 @@
- fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields - fix [ 1378333 ] [WG 6.7.8] Mail Form template doesn't mark required fields
- fix [ 1377276 ] Calendar Pop up issue - fix [ 1377276 ] Calendar Pop up issue
- fix [ 1328728 ] Export exports root page n times - 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 [ 1376621 ] dateSubmitted not updated on posts
- fix [ 1344111 ] promote/demote swap with non-"published" assets - fix [ 1344111 ] promote/demote swap with non-"published" assets
- fix [ 1372630 ] Syndicated encode "&" also if belong to a HTML entity - fix [ 1372630 ] Syndicated encode "&" also if belong to a HTML entity

6
lib/WebGUI/Style.pm
View file

@ -113,6 +113,12 @@ sub process {
my $templateId = shift; my $templateId = shift;
if ($session{page}{makePrintable} && exists $session{asset}) { if ($session{page}{makePrintable} && exists $session{asset}) {
$templateId = $session{asset}->get("printableStyleTemplateId"); $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 "") { } elsif ($session{scratch}{personalStyleId} ne "") {
$templateId = $session{scratch}{personalStyleId}; $templateId = $session{scratch}{personalStyleId};
} elsif ($session{page}{useEmptyStyle}) { } elsif ($session{page}{useEmptyStyle}) {