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

Fix bug #11286: Tell the difference between end of Workflow, and unable to load WorkflowActivity.

Browse source 
Tests are added for new methods.  The changes to Workflow::Instance->run are peripherally
tested in Workflow Activity tests.
This commit is contained in:
Colin Kuskie 2009-12-07 13:07:46 -08:00
parent 89ea0e7cea
commit c845849da0
5 changed files with 105 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

47
lib/WebGUI/Workflow.pm
View file

@ -314,7 +314,8 @@ sub getList {
=head2 getNextActivity ( [ activityId ] )
Returns the next activity in the workflow after the activity specified. If no activity id is specified, then the first workflow will be returned.
Returns the next activity in the workflow after the activity specified.
If no activity id is specified, then the first workflow will be returned.
=head3 activityId
@ -323,13 +324,53 @@ The unique id of an activity in this workflow.
=cut
sub getNextActivity {
my $self = shift;
my $self = shift;
my $activityId = shift;
my $id = $self->getNextActivityId($activityId);
return $self->getActivity($id);
}
#-------------------------------------------------------------------
=head2 getNextActivityId ( [ activityId ] )
Returns the ID of the next activity in the workflow after the activity specified.
If no activity id is specified, then the first workflow will be returned.
=head3 activityId
The unique id of an activity in this workflow.
=cut
sub getNextActivityId {
my $self = shift;
my $activityId = shift;
my ($sequenceNumber) = $self->session->db->quickArray("select sequenceNumber from WorkflowActivity where activityId=?", [$activityId]);
$sequenceNumber++;
my ($id) = $self->session->db->quickArray("select activityId from WorkflowActivity where workflowId=?
and sequenceNumber>=? order by sequenceNumber", [$self->getId, $sequenceNumber]);
return $self->getActivity($id);
return $id;
}
#-------------------------------------------------------------------
=head2 hasNextActivity ( [ activityId ] )
Returns true if there is an activity after the specified activity.
If no activity id is specified, then the first workflow will be returned.
=head3 activityId
The unique id of an activity in this workflow.
=cut
sub hasNextActivity {
my $self = shift;
return $self->getNextActivityId(@_) ? 1 : 0;
}