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

Merge branch 'WebGUI8' into psgi

Browse source
This commit is contained in:
Graham Knop 2010-06-08 17:59:17 -05:00
commit 02af1c68f9
5 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Wobject/StoryArchive.pm
View file

@ -196,7 +196,7 @@ sub exportAssetCollateral {
} }
# open another session to handle printing... # open another session to handle printing...
my $printSession = WebGUI::Session->duplicate; my $printSession = $self->session->duplicate;
my $keywordObj = WebGUI::Keyword->new($printSession); my $keywordObj = WebGUI::Keyword->new($printSession);
my $keywords = $keywordObj->findKeywords({ my $keywords = $keywordObj->findKeywords({

9
lib/WebGUI/Role/Asset/RssFeed.pm
View file

@ -165,9 +165,10 @@ The session doing the full export. Can be used to report status messages.
=cut =cut
sub exportAssetCollateral { around exportAssetCollateral => sub {
# Lots of copy/paste here from AssetExportHtml.pm, since none of the methods there were # Lots of copy/paste here from AssetExportHtml.pm, since none of the methods there were
# directly useful without ginormous refactoring. # directly useful without ginormous refactoring.
my $orig = shift;
my $self = shift; my $self = shift;
my $basepath = shift; my $basepath = shift;
my $args = shift; my $args = shift;
@ -209,7 +210,7 @@ sub exportAssetCollateral {
$reportSession->output->print( $reportSession->output->print(
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . $message . '<br />'); '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . $message . '<br />');
} }
my $exportSession = WebGUI::Session->duplicate; my $exportSession = $self->session->duplicate;
# open another session as the user doing the exporting... # open another session as the user doing the exporting...
my $selfdupe = WebGUI::Asset->newById( $exportSession, $self->getId ); my $selfdupe = WebGUI::Asset->newById( $exportSession, $self->getId );
@ -242,8 +243,8 @@ sub exportAssetCollateral {
$reportSession->output->print($reporti18n->get('done')); $reportSession->output->print($reporti18n->get('done'));
} }
} }
return $self->next::method($basepath, $args, $reportSession); return $self->$orig($basepath, $args, $reportSession);
} };
#------------------------------------------------------------------- #-------------------------------------------------------------------

1
lib/WebGUI/Types.pm
View file

@ -17,6 +17,7 @@ package WebGUI::Types;
use Moose; use Moose;
use Moose::Util::TypeConstraints; use Moose::Util::TypeConstraints;
use JSON ();
=head1 NAME =head1 NAME

1
sbin/testEnvironment.pl
View file

@ -151,6 +151,7 @@ checkModule("Test::Harness", "3.17" );
checkModule("DateTime::Event::ICal", "0.10" ); checkModule("DateTime::Event::ICal", "0.10" );
checkModule( "CHI", ); checkModule( "CHI", );
checkModule( "Cache::FastMmap", ); checkModule( "Cache::FastMmap", );
checkModule('IO::Socket::SSL', );
failAndExit("Required modules are missing, running no more checks.") if $missingModule; failAndExit("Required modules are missing, running no more checks.") if $missingModule;

6
t/lib/WebGUI/Test.pm
View file

@ -1012,6 +1012,12 @@ sub addToCleanup {
} }
sub cleanup { sub cleanup {
if ($ENV{WEBGUI_TEST_NOCLEANUP}) {
(pop @guarded)->dismiss
while @guarded;
return;
}
# remove guards in reverse order they were added, triggering all of the # remove guards in reverse order they were added, triggering all of the
# requested cleanup operations # requested cleanup operations
pop @guarded pop @guarded