an xhtml compatibility bug, and a versioning bug fix

This commit is contained in:
JT Smith 2006-03-24 04:50:56 +00:00
parent f2d06c2b76
commit 17c8275c78
4 changed files with 8 additions and 13 deletions

View file

@ -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()) {

View file

@ -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};

View file

@ -268,7 +268,7 @@ sub www_manageRevisions {
while (my ($date,$by,$tag,$tagId) = $sth->array) {
$output .= '<tr><td>'
.$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)
.'</td>
<td>'.$self->session->datetime->epochToHuman($date).'</td>
<td>'.$by.'</td>
@ -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;

View file

@ -407,7 +407,7 @@ sub www_manageRevisionsInTag {
my $asset = WebGUI::Asset->new($session,$id,$class,$date);
$output .= '<tr><td>'
.$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"))
.'</td>
<td>'.$asset->getTitle.'</td>
<td><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" />'.$asset->getName.'</td>