Merge commit '17ce3572bf' into WebGUI8. All tests passing.
This commit is contained in:
Colin Kuskie
commit
5e502fee53
117 changed files with 2012 additions and 1027 deletions
|
|
@ -1,3 +1,26 @@
|
|||
7.9.7
|
||||
- added #11571: Allow return from photo edit view to gallery edit view
|
||||
- fixed: Reject form submissions without image selected for upload in edit view of Photo asset
|
||||
- fixed #11596: Calendar: all day events leaking
|
||||
- fixed #11604: scheduled workflows getting deleted
|
||||
- fixed #11613: Thingy: If next action after add is to add more things, previous data remains
|
||||
- added API method commitAsUser allowing developers to commit version tags as other users
|
||||
- fixed: The template form plugin would return an empty string when getValueAsHtml was called. ( Martin Kamerbeek / Oqapi )
|
||||
- fixed #11611: Thingy: The add field pop up box has multiple "Text" field types
|
||||
- fixed #11610: Bad hover help for CS sortBy field
|
||||
- fixed #11605: UserList refers to non-existent "publicEmail" user profiling field
|
||||
- fixed #11595: Orphaned data in inbox_messageState
|
||||
- fixed AddressBook feedback for missing fields.
|
||||
- fixed #11606: Syndicated Content feed returns a relative link
|
||||
- fixed #11614: Forums: Sort Fields
|
||||
- fixed #11616: No access to /root
|
||||
- fixed #11619: Trash Expired Events not trashing events
|
||||
- fixed #11623: Navigation CSS-id
|
||||
- fixed #11629: WebGUI Collateral Manager = Error
|
||||
- fixed #11622: Archived CSS entries displayable.
|
||||
- fixed #11560: Email footer hidden from Outlook users
|
||||
- fixed #11643: Account/Contributions: does not show archived content
|
||||
|
||||
7.9.6
|
||||
- new checkbox in the asset manager for clearing the package flag on import
|
||||
- fixed #11597: manageTrash and newlines
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -17,6 +17,12 @@ save you many hours of grief.
|
|||
- Moose
|
||||
- CHI
|
||||
|
||||
7.9.7
|
||||
--------------------------------------------------------------------
|
||||
* Due to a bug introduced in 7.9.3, Scheduler tasks may have been deleted
|
||||
from your site. The 7.9.7 upgrade will restore all default tasks, and tasks
|
||||
for handling email from Collaboration Systems, but you should check any Scheduler
|
||||
tasks that you have created.
|
||||
|
||||
7.9.6
|
||||
--------------------------------------------------------------------
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
241
docs/upgrades/upgrade_7.9.6-7.9.7.pl
Normal file
241
docs/upgrades/upgrade_7.9.6-7.9.7.pl
Normal file
|
|
@ -0,0 +1,241 @@
|
|||
#!/usr/bin/env perl
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
# WebGUI is Copyright 2001-2009 Plain Black Corporation.
|
||||
#-------------------------------------------------------------------
|
||||
# Please read the legal notices (docs/legal.txt) and the license
|
||||
# (docs/license.txt) that came with this distribution before using
|
||||
# this software.
|
||||
#-------------------------------------------------------------------
|
||||
# http://www.plainblack.com info@plainblack.com
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
our ($webguiRoot);
|
||||
|
||||
BEGIN {
|
||||
$webguiRoot = "../..";
|
||||
unshift (@INC, $webguiRoot."/lib");
|
||||
}
|
||||
|
||||
use strict;
|
||||
use Getopt::Long;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Storage;
|
||||
use WebGUI::Asset;
|
||||
use WebGUI::Asset::Wobject::Collaboration;
|
||||
use WebGUI::Exception;
|
||||
use WebGUI::Workflow::Cron;
|
||||
use WebGUI::Utility qw/isIn/;
|
||||
|
||||
|
||||
my $toVersion = '7.9.7';
|
||||
my $quiet; # this line required
|
||||
|
||||
|
||||
my $session = start(); # this line required
|
||||
|
||||
# upgrade functions go here
|
||||
restoreDefaultCronJobs($session);
|
||||
restoreCsCronJobs($session);
|
||||
cleanup_inbox_messageStateTable($session);
|
||||
|
||||
finish($session); # this line required
|
||||
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Describe what our function does
|
||||
#sub exampleFunction {
|
||||
# my $session = shift;
|
||||
# print "\tWe're doing some stuff here that you should know about... " unless $quiet;
|
||||
# # and here's our code
|
||||
# print "DONE!\n" unless $quiet;
|
||||
#}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Describe what our function does
|
||||
sub cleanup_inbox_messageStateTable {
|
||||
my $session = shift;
|
||||
print "\tDelete dead entries from the inbox_MessageState table. This may take a long time... " unless $quiet;
|
||||
# and here's our code
|
||||
my $source = $session->db->read("select messageId from inbox_messageState s where not exists(select messageId from inbox where messageId = s.messageId)");
|
||||
my $cleaner = $session->db->prepare("delete from inbox_messageState where messageId=?");
|
||||
while (my ($messageId) = $source->array) {
|
||||
$cleaner->execute([$messageId]);
|
||||
}
|
||||
$source->finish;
|
||||
$cleaner->finish;
|
||||
print "DONE!\n" unless $quiet;
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Describe what our function does
|
||||
sub restoreDefaultCronJobs {
|
||||
my $session = shift;
|
||||
# and here's our code
|
||||
print "\tRestore missing default cron jobs that may have been deleted... " unless $quiet;
|
||||
my $tasks = WebGUI::Workflow::Cron->getAllTasks($session);
|
||||
my @taskIds = map { $_->getId } @{ $tasks };
|
||||
if (! isIn('pbcron0000000000000001', @taskIds)) {
|
||||
print "\n\t\tRestoring Daily Maintenance Task... " unless $quiet;
|
||||
WebGUI::Workflow::Cron->create($session, {
|
||||
title => "Daily Maintenance", dayOfMonth => '*',
|
||||
enabled => 1, monthOfYear => '*',
|
||||
runOnce => 0, dayOfWeek => '*',
|
||||
minuteOfHour => 30, workflowId => 'pbworkflow000000000001',
|
||||
hourOfDay => 23, priority => 3,
|
||||
},
|
||||
'pbcron0000000000000001');
|
||||
}
|
||||
if (! isIn('pbcron0000000000000002', @taskIds)) {
|
||||
print "\n\t\tRestoring Weekly Maintenance Task... " unless $quiet;
|
||||
WebGUI::Workflow::Cron->create($session, {
|
||||
title => "Weekly Maintenance", dayOfMonth => '*',
|
||||
enabled => 1, monthOfYear => '*',
|
||||
runOnce => 0, dayOfWeek => '0',
|
||||
minuteOfHour => 30, workflowId => 'pbworkflow000000000002',
|
||||
hourOfDay => 1, priority => 3,
|
||||
},
|
||||
'pbcron0000000000000002');
|
||||
}
|
||||
if (! isIn('pbcron0000000000000003', @taskIds)) {
|
||||
print "\n\t\tRestoring Hourly Maintenance Task... " unless $quiet;
|
||||
WebGUI::Workflow::Cron->create($session, {
|
||||
title => "Hourly Maintenance", dayOfMonth => '*',
|
||||
enabled => 1, monthOfYear => '*',
|
||||
runOnce => 0, dayOfWeek => '*',
|
||||
minuteOfHour => 15, workflowId => 'pbworkflow000000000004',
|
||||
hourOfDay => '*', priority => 3,
|
||||
},
|
||||
'pbcron0000000000000003');
|
||||
}
|
||||
if (! isIn('pbcron0000000000000004', @taskIds)) {
|
||||
print "\n\t\tRestoring Email Delivery Task... " unless $quiet;
|
||||
WebGUI::Workflow::Cron->create($session, {
|
||||
title => "Send Queued Email Messages Every 5 Minutes",
|
||||
dayOfMonth => '*',
|
||||
enabled => 1, monthOfYear => '*',
|
||||
runOnce => 0, dayOfWeek => '*',
|
||||
minuteOfHour => '*/5', workflowId => 'pbworkflow000000000007',
|
||||
hourOfDay => '*', priority => 3,
|
||||
},
|
||||
'pbcron0000000000000004');
|
||||
}
|
||||
print "DONE!\n" unless $quiet;
|
||||
}
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Describe what our function does
|
||||
sub restoreCsCronJobs {
|
||||
my $session = shift;
|
||||
print "\tRestore missing Collaboration System cron jobs that may have been deleted... " unless $quiet;
|
||||
my $i18n = WebGUI::International->new($session, "Asset_Collaboration");
|
||||
my $getCs = WebGUI::Asset::Wobject::Collaboration->getIsa($session);
|
||||
CS: while (1) {
|
||||
my $cs = eval { $getCs->(); };
|
||||
if (my $e = Exception::Class->caught()) {
|
||||
$session->log->error($@);
|
||||
next CS;
|
||||
}
|
||||
last CS unless $cs;
|
||||
##Do something useful with $product
|
||||
my $cron = undef;
|
||||
if ($cs->get("getMailCronId")) {
|
||||
$cron = WebGUI::Workflow::Cron->new($session, $cs->get("getMailCronId"));
|
||||
}
|
||||
next CS if $cron;
|
||||
$cron = WebGUI::Workflow::Cron->create($session, {
|
||||
title => $cs->getTitle." ".$i18n->get("mail"),
|
||||
minuteOfHour => "*/".($cs->get("getMailInterval")/60),
|
||||
className => (ref $cs),
|
||||
methodName => "new",
|
||||
parameters => $cs->getId,
|
||||
workflowId => "csworkflow000000000001"
|
||||
});
|
||||
$cs->update({getMailCronId=>$cron->getId});
|
||||
if ($cs->get("getMail")) {
|
||||
$cron->set({enabled=>1,title=>$cs->getTitle." ".$i18n->get("mail"), minuteOfHour=>"*/".($cs->get("getMailInterval")/60)});
|
||||
} else {
|
||||
$cron->set({enabled=>0,title=>$cs->getTitle." ".$i18n->get("mail"), minuteOfHour=>"*/".($cs->get("getMailInterval")/60)});
|
||||
}
|
||||
|
||||
}
|
||||
print "DONE!\n" unless $quiet;
|
||||
}
|
||||
|
||||
|
||||
# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Add a package to the import node
|
||||
sub addPackage {
|
||||
my $session = shift;
|
||||
my $file = shift;
|
||||
|
||||
print "\tUpgrading package $file\n" unless $quiet;
|
||||
# Make a storage location for the package
|
||||
my $storage = WebGUI::Storage->createTemp( $session );
|
||||
$storage->addFileFromFilesystem( $file );
|
||||
|
||||
# Import the package into the import node
|
||||
my $package = eval {
|
||||
my $node = WebGUI::Asset->getImportNode($session);
|
||||
$node->importPackage( $storage, {
|
||||
overwriteLatest => 1,
|
||||
clearPackageFlag => 1,
|
||||
setDefaultTemplate => 1,
|
||||
} );
|
||||
};
|
||||
|
||||
if ($package eq 'corrupt') {
|
||||
die "Corrupt package found in $file. Stopping upgrade.\n";
|
||||
}
|
||||
if ($@ || !defined $package) {
|
||||
die "Error during package import on $file: $@\nStopping upgrade\n.";
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
#-------------------------------------------------
|
||||
sub start {
|
||||
my $configFile;
|
||||
$|=1; #disable output buffering
|
||||
GetOptions(
|
||||
'configFile=s'=>\$configFile,
|
||||
'quiet'=>\$quiet
|
||||
);
|
||||
my $session = WebGUI::Session->open($webguiRoot,$configFile);
|
||||
$session->user({userId=>3});
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
$versionTag->set({name=>"Upgrade to ".$toVersion});
|
||||
return $session;
|
||||
}
|
||||
|
||||
#-------------------------------------------------
|
||||
sub finish {
|
||||
my $session = shift;
|
||||
updateTemplates($session);
|
||||
my $versionTag = WebGUI::VersionTag->getWorking($session);
|
||||
$versionTag->commit;
|
||||
$session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
|
||||
$session->close();
|
||||
}
|
||||
|
||||
#-------------------------------------------------
|
||||
sub updateTemplates {
|
||||
my $session = shift;
|
||||
return undef unless (-d "packages-".$toVersion);
|
||||
print "\tUpdating packages.\n" unless ($quiet);
|
||||
opendir(DIR,"packages-".$toVersion);
|
||||
my @files = readdir(DIR);
|
||||
closedir(DIR);
|
||||
my $newFolder = undef;
|
||||
foreach my $file (@files) {
|
||||
next unless ($file =~ /\.wgpkg$/);
|
||||
# Fix the filename to include a path
|
||||
$file = "packages-" . $toVersion . "/" . $file;
|
||||
addPackage( $session, $file );
|
||||
}
|
||||
}
|
||||
|
||||
#vim:ft=perl
|
||||
Loading…
Add table
Add a link
Reference in a new issue