Merge branch 'master' into WebGUI8. Merged up to 7.10.4

lib/WebGUI/Workflow/Activity.pm

@@ -76,6 +76,22 @@ These methods are available from this class:
 
 #-------------------------------------------------------------------
 
+=head2 cleanup ( )
+
+Override this activity to add a cleanup routine to be run if an instance
+is deleted with this activity currently in a waiting state.  This is a stub
+and will do nothing unless overridden.
+
+=cut
+
+sub cleanup {
+	my $self     = shift;
+	my $instance = shift;
+	return 1;
+}
+
+#-------------------------------------------------------------------
+
 =head2 create ( session, workflowId [, id, classname  ] )
 
 Creates a new instance of this activity in a workflow.

lib/WebGUI/Workflow/Activity/RemoveOldForks.pm

@@ -0,0 +1,82 @@
+package WebGUI::Workflow::Activity::RemoveOldForks;
+
+=head1 LEGAL
+
+ -------------------------------------------------------------------
+  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
+ -------------------------------------------------------------------
+
+=cut
+
+use warnings;
+use strict;
+
+use base 'WebGUI::Workflow::Activity';
+
+use WebGUI::International;
+use WebGUI::Fork;
+
+=head1 NAME
+
+WebGUI::Workflow::Activity::RemoveOldForks
+
+=head1 DESCRIPTION
+
+Remove forks that are older than a configurable threshold.
+
+=head1 METHODS
+
+These methods are available from this class:
+
+=cut
+
+#-------------------------------------------------------------------
+
+=head2 definition ( session, definition )
+
+See WebGUI::Workflow::Activity::definition() for details.
+
+=cut
+
+sub definition {
+    my ( $class, $session, $definition ) = @_;
+    my $i18n = WebGUI::International->new( $session, 'Workflow_Activity_RemoveOldForks' );
+    my %def = (
+        name       => $i18n->get('activityName'),
+        properties => {
+            interval => {
+                fieldType    => 'interval',
+                label        => $i18n->get('interval'),
+                defaultValue => 60 * 60 * 24 * 7,
+                hoverHelp    => $i18n->get('interval help')
+            }
+        }
+    );
+    push @$definition, \%def;
+    return $class->SUPER::definition( $session, $definition );
+} ## end sub definition
+
+#-------------------------------------------------------------------
+
+=head2 execute ( [ object ] )
+
+See WebGUI::Workflow::Activity::execute() for details.
+
+=cut
+
+sub execute {
+    my $self = shift;
+    my $db   = $self->session->db;
+    my $tbl  = $db->dbh->quote_identifier( WebGUI::Fork->tableName );
+    my $time = time - $self->get('interval');
+    $db->write( "DELETE FROM $tbl WHERE endTime <= ?", [$time] );
+    return $self->COMPLETE;
+}
+
+1;

lib/WebGUI/Workflow/Activity/RequestApprovalForVersionTag.pm

@@ -44,6 +44,23 @@ These methods are available from this class:
 
 #-------------------------------------------------------------------
 
+=head2 cleanup ( )
+
+Override this activity to add a cleanup routine to be run if an instance
+is deleted with this activity currently in a waiting state.  This is a stub
+and will do nothing unless overridden.
+
+=cut
+
+sub cleanup {
+	my $self     = shift;
+	my $instance = shift;
+    $self->setMessageCompleted($instance);
+	return 1;
+}
+
+#-------------------------------------------------------------------
+
 =head2 definition ( session, definition )
 
 See WebGUI::Workflow::Activity::definition() for details.

lib/WebGUI/Workflow/Instance.pm

@@ -101,11 +101,22 @@ A boolean, that if true will not notify Spectre of the delete.
 =cut
 
 sub delete {
-	my $self = shift;
+	my $self       = shift;
+    my $session    = $self->session;
 	my $skipNotify = shift;
-	$self->session->db->write("delete from WorkflowInstanceScratch where instanceId=?",[$self->getId]);
-	$self->session->db->deleteRow("WorkflowInstance","instanceId",$self->getId);
-	WebGUI::Workflow::Spectre->new($self->session)->notify("workflow/deleteInstance",$self->getId) unless ($skipNotify);
+
+    if ( $self->hasNextActivity ) {
+        #We are deleting in the middle of a workflow - Get the current activity and call the cleanup routine
+        my $activity = $self->getNextActivity;
+        eval { $activity->cleanup($self) };
+        if ($@) {
+            $session->errorHandler->error("Caught exception executing cleanup routine which was not run on workflow activity ".$activity->getId." for instance ".$self->getId.".  The following error was reported: ".$@);
+        }
+    }
+
+	$session->db->write("delete from WorkflowInstanceScratch where instanceId=?",[$self->getId]);
+	$session->db->deleteRow("WorkflowInstance","instanceId",$self->getId);
+	WebGUI::Workflow::Spectre->new($session)->notify("workflow/deleteInstance",$self->getId) unless ($skipNotify);
 
 	# We will need to remember that we were deleted if we get realtime-run
 	# during start().