From 17c8275c78546794dfcc756f7bf787eeab393531 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 24 Mar 2006 04:50:56 +0000 Subject: [PATCH] an xhtml compatibility bug, and a versioning bug fix --- lib/WebGUI.pm | 3 ++- lib/WebGUI/Asset/FilePile.pm | 5 ++++- lib/WebGUI/AssetVersioning.pm | 11 +---------- lib/WebGUI/Operation/VersionTag.pm | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index 78fd26b7e..ca35fa36d 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -178,7 +178,8 @@ sub page { $output = "An error was encountered while processing your request."; } $output = "An error was encountered while processing your request." if $output eq ''; - } elsif ($output eq "chunked") { + } + if ($output eq "chunked") { $output = undef; } if ($session->errorHandler->canShowDebug()) { diff --git a/lib/WebGUI/Asset/FilePile.pm b/lib/WebGUI/Asset/FilePile.pm index ac300afb2..29af0a062 100644 --- a/lib/WebGUI/Asset/FilePile.pm +++ b/lib/WebGUI/Asset/FilePile.pm @@ -158,7 +158,10 @@ sub editSave { $data{storageId} = $storage->getId; $data{filename} = $data{title} = $data{menuTitle} = $filename; $data{templateId} = 'PBtmpl0000000000000024'; - $data{templateId} = 'PBtmpl0000000000000088' if ($selfName eq "WebGUI::Asset::File::Image"); + if ($selfName eq "WebGUI::Asset::File::Image") { + $data{templateId} = 'PBtmpl0000000000000088'; + $data{parameters} = 'alt="'.$self->get("title").'"'; + } $data{url} = $self->getParent->get('url').'/'.$filename; my $newAsset = $self->getParent->addChild(\%data); delete $newAsset->{_storageLocation}; diff --git a/lib/WebGUI/AssetVersioning.pm b/lib/WebGUI/AssetVersioning.pm index bf37a4538..341c153d1 100644 --- a/lib/WebGUI/AssetVersioning.pm +++ b/lib/WebGUI/AssetVersioning.pm @@ -268,7 +268,7 @@ sub www_manageRevisions { while (my ($date,$by,$tag,$tagId) = $sth->array) { $output .= '' .$self->session->icon->delete("func=purgeRevision;revisionDate=".$date,$self->get("url"),$i18n->get("purge revision prompt")) - .$self->session->icon->view("func=viewRevision;revisionDate=".$date) + .$self->session->icon->view("func=view;revision=".$date) .' '.$self->session->datetime->epochToHuman($date).' '.$by.' @@ -296,14 +296,5 @@ sub www_purgeRevision { return $self->www_manageRevisions; } - -#------------------------------------------------------------------- - -sub www_viewRevision { - my $self = shift; - my $otherSelf = WebGUI::Asset->new($self->session,$self->getId,$self->get("className"),$self->session->form->process("revisionDate")); - return (defined $otherSelf) ? $otherSelf->www_view : undef; -} - 1; diff --git a/lib/WebGUI/Operation/VersionTag.pm b/lib/WebGUI/Operation/VersionTag.pm index 78c86f0d1..42559a160 100644 --- a/lib/WebGUI/Operation/VersionTag.pm +++ b/lib/WebGUI/Operation/VersionTag.pm @@ -407,7 +407,7 @@ sub www_manageRevisionsInTag { my $asset = WebGUI::Asset->new($session,$id,$class,$date); $output .= '' .$session->icon->delete("func=purgeRevision;proceed=manageRevisionsInTag;tagId=".$tag->getId.";revisionDate=".$date,$asset->get("url"),$i18n->get("purge revision prompt")) - .$session->icon->view("func=viewRevision;revisionDate=".$date, $asset->get("url")) + .$session->icon->view("func=view;revision=".$date, $asset->get("url")) .' '.$asset->getTitle.' '.$asset->getName.''.$asset->getName.'