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

Fix bad EMS Submissions merging.

Browse source
This commit is contained in:
Colin Kuskie 2009-11-04 21:49:30 -08:00
parent 4d0fa5370f
commit 40cec4b855
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/upgrades/upgrade_7.7.20-7.8.0.pl
View file

@ -119,7 +119,7 @@ sub fixEmptyCalendarIcalFeeds {
print "DONE!\n" unless $quiet; print "DONE!\n" unless $quiet;
} }
[
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Add tables for the EMS Submission feature # Add tables for the EMS Submission feature
sub addEMSSubmission { sub addEMSSubmission {
@ -172,7 +172,7 @@ ESQL
print "DONE!\n" unless $quiet; print "DONE!\n" unless $quiet;
} }
]
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Add the column for featured wiki pages # Add the column for featured wiki pages
sub addFeaturedPageWiki { sub addFeaturedPageWiki {

1
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -793,7 +793,6 @@ sub www_addSubmission {
$session->http->setMimeType( 'text/html' ); $session->http->setMimeType( 'text/html' );
} }
my $content = '<h1>' . $title . '</h1><ul>' . $listOfLinks . '</ul>' ; my $content = '<h1>' . $title . '</h1><ul>' . $listOfLinks . '</ul>' ;
use lib '/root/pb/lib'; use dav; dav::log $content;
if( $asJson ) { if( $asJson ) {
return JSON->new->encode( { text => $content, title => $title, id => 'list' . rand } ); return JSON->new->encode( { text => $content, title => $title, id => 'list' . rand } );
} else { } else {

5
lib/WebGUI/Workflow/Activity/CleanupEMSSubmissions.pm
View file

@ -68,13 +68,10 @@ See WebGUI::Workflow::Activity::execute() for details.
=cut =cut
use lib '/root/pb/lib'; use dav;
sub execute { sub execute {
my $self = shift; my $self = shift;
my $session = $self->session; my $session = $self->session;
my $root = WebGUI::Asset->getRoot($session); my $root = WebGUI::Asset->getRoot($session);
dav::log __PACKAGE__ . " executing\n";
# keep track of how much time it's taking # keep track of how much time it's taking
my $start = time; my $start = time;
@ -86,7 +83,6 @@ dav::log __PACKAGE__ . " executing\n";
} ); } );
for my $emsForm ( @$list ) { for my $emsForm ( @$list ) {
dav::log __PACKAGE__ . "::executing::emsForm loop\n";
my $daysBeforeCleanup = $emsForm->get('daysBeforeCleanup') ; my $daysBeforeCleanup = $emsForm->get('daysBeforeCleanup') ;
next if ! $daysBeforeCleanup; next if ! $daysBeforeCleanup;
my $whereClause = q{ submissionStatus='denied' }; my $whereClause = q{ submissionStatus='denied' };
@ -101,7 +97,6 @@ dav::log __PACKAGE__ . "::executing::emsForm loop\n";
whereClause => $whereClause, whereClause => $whereClause,
} ); } );
for my $submission ( @$res ) { for my $submission ( @$res ) {
dav::log __PACKAGE__ . "::executing::submission loop\n";
$submission->purge; $submission->purge;
$limit--; $limit--;
return $self->WAITING(1) if ! $limit or time > $start + $timeLimit; return $self->WAITING(1) if ! $limit or time > $start + $timeLimit;