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

a few bug fixes

Browse source
This commit is contained in:
JT Smith 2006-03-22 20:29:14 +00:00
parent 5fa09ae97f
commit 080eb061ef
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI.pm
View file

@ -178,6 +178,8 @@ sub page {
$output = "An error was encountered while processing your request."; $output = "An error was encountered while processing your request.";
} }
$output = "An error was encountered while processing your request." if $output eq ''; $output = "An error was encountered while processing your request." if $output eq '';
} elsif ($output eq "chunked") {
$output = undef;
} }
if ($session->errorHandler->canShowDebug()) { if ($session->errorHandler->canShowDebug()) {
$output .= $session->errorHandler->showDebug(); $output .= $session->errorHandler->showDebug();

4
lib/WebGUI/Asset.pm
View file

@ -28,8 +28,6 @@ use WebGUI::AdminConsole;
use WebGUI::Cache; use WebGUI::Cache;
use WebGUI::Form; use WebGUI::Form;
use WebGUI::HTMLForm; use WebGUI::HTMLForm;
use WebGUI::Search;
use WebGUI::Search::Index;
use WebGUI::TabForm; use WebGUI::TabForm;
use WebGUI::Utility; use WebGUI::Utility;
@ -1421,7 +1419,7 @@ sub newByUrl {
=head2 prepareView ( ) =head2 prepareView ( )
Executes what is necessary to make the view() method work with content streaming. This includes things like processing template head tags. Executes what is necessary to make the view() method work with content chunking. This includes things like processing template head tags.
=cut =cut

6
lib/WebGUI/Asset/Wobject.pm
View file

@ -579,10 +579,10 @@ sub www_view {
return $self->session->privilege->noAccess(); return $self->session->privilege->noAccess();
} elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^trash/) { # show em trash } elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^trash/) { # show em trash
$self->session->http->setRedirect($self->getUrl("func=manageTrash")); $self->session->http->setRedirect($self->getUrl("func=manageTrash"));
return ""; return undef;
} elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^clipboard/) { # show em clipboard } elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^clipboard/) { # show em clipboard
$self->session->http->setRedirect($self->getUrl("func=manageClipboard")); $self->session->http->setRedirect($self->getUrl("func=manageClipboard"));
return ""; return undef;
} else { # tell em it doesn't exist anymore } else { # tell em it doesn't exist anymore
$self->session->http->setStatus("410"); $self->session->http->setStatus("410");
return WebGUI::Asset->getNotFound($self->session)->www_view; return WebGUI::Asset->getNotFound($self->session)->www_view;
@ -603,7 +603,7 @@ sub www_view {
$self->session->output->print($head); $self->session->output->print($head);
$self->session->output->print($self->view); $self->session->output->print($self->view);
$self->session->output->print($foot); $self->session->output->print($foot);
return undef; return "chunked";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

4
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -916,12 +916,12 @@ sub view {
$var{'best.views.url'} = $self->formatURL("viewDetail",$data->{listingId}); $var{'best.views.url'} = $self->formatURL("viewDetail",$data->{listingId});
$var{'best.views.count'} = $data->{views}; $var{'best.views.count'} = $data->{views};
$var{'best.views.name'} = $data->{productName}; $var{'best.views.name'} = $data->{productName};
my $data = $self->session->db->quickHashRef("select compares, productName, listingId from Matrix_listing $data = $self->session->db->quickHashRef("select compares, productName, listingId from Matrix_listing
where assetId=".$self->session->db->quote($self->getId)." and status='approved' order by compares desc limit 1"); where assetId=".$self->session->db->quote($self->getId)." and status='approved' order by compares desc limit 1");
$var{'best.compares.url'} = $self->formatURL("viewDetail",$data->{listingId}); $var{'best.compares.url'} = $self->formatURL("viewDetail",$data->{listingId});
$var{'best.compares.count'} = $data->{compares}; $var{'best.compares.count'} = $data->{compares};
$var{'best.compares.name'} = $data->{productName}; $var{'best.compares.name'} = $data->{productName};
my $data = $self->session->db->quickHashRef("select clicks, productName, listingId from Matrix_listing $data = $self->session->db->quickHashRef("select clicks, productName, listingId from Matrix_listing
where assetId=".$self->session->db->quote($self->getId)." and status='approved' order by clicks desc limit 1"); where assetId=".$self->session->db->quote($self->getId)." and status='approved' order by clicks desc limit 1");
$var{'best.clicks.url'} = $self->formatURL("viewDetail",$data->{listingId}); $var{'best.clicks.url'} = $self->formatURL("viewDetail",$data->{listingId});
$var{'best.clicks.count'} = $data->{clicks}; $var{'best.clicks.count'} = $data->{clicks};

1
lib/WebGUI/AssetVersioning.pm
View file

@ -17,6 +17,7 @@ package WebGUI::Asset;
use strict; use strict;
use WebGUI::Paginator; use WebGUI::Paginator;
use WebGUI::VersionTag; use WebGUI::VersionTag;
use WebGUI::Search::Index;
=head1 NAME =head1 NAME

1
lib/WebGUI/Search.pm
View file

@ -16,7 +16,6 @@ package WebGUI::Search;
use strict; use strict;
use WebGUI::Asset; use WebGUI::Asset;
use WebGUI::SQL;
=head1 NAME =head1 NAME