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

a couple small bug fixes

Browse source
This commit is contained in:
JT Smith 2006-03-19 21:50:49 +00:00
parent 524ea87d36
commit 9dac1d5178
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/WebGUI/Workflow/Instance.pm
View file

@ -216,9 +216,7 @@ sub run {
return "undefined" unless (defined $workflow);
return "disabled" unless ($workflow->get("enabled"));
my $activity = $workflow->getNextActivity($self->get("currentActivityId"));
if (defined $activity) {
$self->set({"currentActivityId",$activity->getId});
} else {
unless (defined $activity) {
$self->delete;
return "done";
}
@ -226,6 +224,7 @@ sub run {
my $class = $self->get("className");
my $method = $self->get("methodName");
my $params = $self->get("parameters");
my $status = "";
if ($class && $method) {
my $cmd = "use $class";
eval($cmd);
@ -238,9 +237,14 @@ sub run {
$self->session->errorHandler->warn("Error instanciating activity (".$activity->getId.") pass-in object: ".$@);
return "error";
}
return $activity->execute($object, $self);
$status = $activity->execute($object, $self);
} else {
$status = $activity->execute(undef, $self);
}
return $activity->execute(undef, $self);
if ($status eq "complete") {
$self->set({"currentActivityId"=>$activity->getId});
}
return $status;
}