diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 2ccd67b87..32bd87fb6 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,10 +1,11 @@ 7.10.3 - -7.10.2 - Added WebGUI::Fork api - Moved html export to Fork - Moved clipboard functions to Fork - Moved trash functions to Fork + - Moved version tag rollback to Fork + +7.10.2 - fixed #11884: Editing Templates impossible / Code editor not loaded - recommitted ukplayer. Removal broke Matrix. Licencing information was available but overlooked. - fixed #11883: Wiki "Add page" link does not encode special chars diff --git a/docs/gotcha.txt b/docs/gotcha.txt index e79db5162..547ea6d3c 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -7,6 +7,10 @@ upgrading from one version to the next, or even between multiple versions. Be sure to heed the warnings contained herein as they will save you many hours of grief. +7.10.3 +-------------------------------------------------------------------- + * WebGUI now depends on Monkey::Patch for sanely scoped monkeypatching. + 7.10.2 -------------------------------------------------------------------- * The URL used by Display Message on Login always returns the user to @@ -19,8 +23,6 @@ save you many hours of grief. is in WebGUI again. Licencing information was overlooked. An upgrade to 7.10.1 will break the Matrix. This is fixed now. - * WebGUI now depends on Monkey::Patch for sanely scoped monkeypatching. - 7.10.1 -------------------------------------------------------------------- * WebGUI now depends on PerlIO::eol, for doing line ending translation. diff --git a/docs/upgrades/upgrade_7.10.1-7.10.2.pl b/docs/upgrades/upgrade_7.10.1-7.10.2.pl index 410288491..d2f49d9fc 100644 --- a/docs/upgrades/upgrade_7.10.1-7.10.2.pl +++ b/docs/upgrades/upgrade_7.10.1-7.10.2.pl @@ -22,7 +22,7 @@ use Getopt::Long; use WebGUI::Session; use WebGUI::Storage; use WebGUI::Asset; -use List::Util qw(first); + my $toVersion = '7.10.2'; my $quiet; # this line required @@ -31,53 +31,9 @@ my $quiet; # this line required my $session = start(); # this line required # upgrade functions go here -addForkTable($session); -installForkCleanup($session); finish($session); # this line required -#---------------------------------------------------------------------------- -# Creates a new table for tracking background processes -sub addForkTable { - my $session = shift; - my $db = $session->db; - my $sth = $db->dbh->table_info('', '', 'Fork', 'TABLE'); - return if ($sth->fetch); - print "\tAdding Fork table..." unless $quiet; - my $sql = q{ - CREATE TABLE Fork ( - id CHAR(22), - userId CHAR(22), - groupId CHAR(22), - status LONGTEXT, - error TEXT, - startTime BIGINT(20), - endTime BIGINT(20), - finished BOOLEAN DEFAULT FALSE, - latch BOOLEAN DEFAULT FALSE, - - PRIMARY KEY(id) - ); - }; - $db->write($sql); - print "DONE!\n" unless $quiet; -} - -#---------------------------------------------------------------------------- -# install a workflow to clean up old background processes -sub installForkCleanup { - my $session = shift; - print "\tInstalling Fork Cleanup workflow..." unless $quiet; - my $class = 'WebGUI::Workflow::Activity::RemoveOldForks'; - $session->config->addToArray('workflowActivities/None', $class); - my $wf = WebGUI::Workflow->new($session, 'pbworkflow000000000001'); - my $a = first { ref $_ eq $class } @{ $wf->getActivities }; - unless ($a) { - $a = $wf->addActivity($class); - $a->set(title => 'Remove Old Forks'); - }; - print "DONE!\n" unless $quiet; -} #---------------------------------------------------------------------------- # Describe what our function does diff --git a/docs/upgrades/upgrade_7.10.2-7.10.3.pl b/docs/upgrades/upgrade_7.10.2-7.10.3.pl index f0d799e25..34ccecae5 100644 --- a/docs/upgrades/upgrade_7.10.2-7.10.3.pl +++ b/docs/upgrades/upgrade_7.10.2-7.10.3.pl @@ -31,9 +31,52 @@ my $quiet; # this line required my $session = start(); # this line required # upgrade functions go here - +addForkTable($session); +installForkCleanup($session); finish($session); # this line required +#---------------------------------------------------------------------------- +# Creates a new table for tracking background processes +sub addForkTable { + my $session = shift; + my $db = $session->db; + my $sth = $db->dbh->table_info('', '', 'Fork', 'TABLE'); + return if ($sth->fetch); + print "\tAdding Fork table..." unless $quiet; + my $sql = q{ + CREATE TABLE Fork ( + id CHAR(22), + userId CHAR(22), + groupId CHAR(22), + status LONGTEXT, + error TEXT, + startTime BIGINT(20), + endTime BIGINT(20), + finished BOOLEAN DEFAULT FALSE, + latch BOOLEAN DEFAULT FALSE, + + PRIMARY KEY(id) + ); + }; + $db->write($sql); + print "DONE!\n" unless $quiet; +} + +#---------------------------------------------------------------------------- +# install a workflow to clean up old background processes +sub installForkCleanup { + my $session = shift; + print "\tInstalling Fork Cleanup workflow..." unless $quiet; + my $class = 'WebGUI::Workflow::Activity::RemoveOldForks'; + $session->config->addToArray('workflowActivities/None', $class); + my $wf = WebGUI::Workflow->new($session, 'pbworkflow000000000001'); + my $a = first { ref $_ eq $class } @{ $wf->getActivities }; + unless ($a) { + $a = $wf->addActivity($class); + $a->set(title => 'Remove Old Forks'); + }; + print "DONE!\n" unless $quiet; +} #---------------------------------------------------------------------------- # Describe what our function does