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

Fix Cron issues with CSes. Fixes bug #11284.

Browse source
This commit is contained in:
Colin Kuskie 2009-11-30 11:11:36 -08:00
parent cb74591afa
commit 9bb5497aff
4 changed files with 67 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,6 +1,7 @@
7.8.7
- fixed #11278: Wrong test for Template::Toolkit in testEnvironment.pl
- fixed #11282: USPS Shipping Driver does not accept ZIP+4
- fixed #11284: Collaboration System Cron jobs for email
7.8.6
- fixed #11250: i18n Asset_EMSSubmissionForm::delete created items label help

44
docs/upgrades/upgrade_7.8.6-7.8.7.pl
View file

@ -22,6 +22,8 @@ use Getopt::Long;
use WebGUI::Session;
use WebGUI::Storage;
use WebGUI::Asset;
use WebGUI::Workflow::Cron;
use WebGUI::Asset::Wobject::Collaboration;
my $toVersion = '7.8.7';
@ -31,6 +33,8 @@ my $quiet; # this line required
my $session = start(); # this line required
# upgrade functions go here
clearOrphanedCSMailCronJobs($session);
deleteExtraCronJobsForCS($session);
finish($session); # this line required
@ -44,6 +48,46 @@ finish($session); # this line required
# print "DONE!\n" unless $quiet;
#}
#----------------------------------------------------------------------------
# Describe what our function does
sub clearOrphanedCSMailCronJobs {
my $session = shift;
print "\tClear orphaned csworkflow000000000001 Cron Jobs with no CS attached... " unless $quiet;
my $crons = WebGUI::Workflow::Cron->getAllTasks($session);
##This section of code handles cron jobs created for CS'es where the revision of the
##CS with the cron has been deleted.
CRON: foreach my $cron (@{ $crons }) {
next CRON unless $cron->get('workflowId') eq 'csworkflow000000000001';
my $assetId = $cron->get('parameters');
my $asset = WebGUI::Asset->newByDynamicClass($session, $assetId);
next CRON if $asset;
print "\n\t\tDeleting ".$cron->get('title') unless $quiet;
$cron->delete;
}
print "\tDONE!\n" unless $quiet;
}
#----------------------------------------------------------------------------
# Describe what our function does
sub deleteExtraCronJobsForCS {
my $session = shift;
print "\tGuarantee that each CS has one and only one Cron job. Older jobs will be deleted... " unless $quiet;
my $cses = WebGUI::Asset::Wobject::Collaboration->getIsa($session);
CS: while( my $cs = $cses->() ) {
my @cronIds = $session->db->buildArray('select distinct(getMailCronId) from Collaboration where assetId=?',[$cs->getId]);
next CS unless @cronIds > 1;
my @oldCronIds = grep { $_ ne $cs->get('getMailCronId') } @cronIds;
CRON: foreach my $cronId (@oldCronIds) {
my $cron = WebGUI::Workflow::Cron->new($session, $cronId);
next CRON unless $cron;
print "\n\t\tDeleting ".$cron->get('title') unless $quiet;
$cron->delete;
}
$session->db->write('update Collaboration set getMailCronId=? where assetId=?', [$cs->get('getMailCronId'), $cs->getId]);
}
print "\tDONE!\n" unless $quiet;
}
# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------