From 742efc3a602df49e1d5c2e94bd60fba159cf7238 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Thu, 16 Mar 2006 19:06:37 +0000 Subject: [PATCH] little bug fixes --- docs/upgrades/upgrade_6.8.7-6.99.0.pl | 1 + lib/WebGUI/Operation/Cron.pm | 2 +- lib/WebGUI/Workflow.pm | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/upgrades/upgrade_6.8.7-6.99.0.pl b/docs/upgrades/upgrade_6.8.7-6.99.0.pl index 00205675d..761b67847 100644 --- a/docs/upgrades/upgrade_6.8.7-6.99.0.pl +++ b/docs/upgrades/upgrade_6.8.7-6.99.0.pl @@ -266,6 +266,7 @@ sub addWorkflow { type=>"WebGUI::VersionTag" }, "pbworkflow000000000003"); $activity = $workflow->addActivity("WebGUI::Workflow::Activity::CommitVersionTag", "pbwfactivity0000000006"); + $activity->set("title", "Commit Assets"); $workflow = WebGUI::Workflow->create($session, { title=>"Commit With Approval", description=>"This workflow commits all the assets in this version tag after getting approval from content managers.", diff --git a/lib/WebGUI/Operation/Cron.pm b/lib/WebGUI/Operation/Cron.pm index 8668931cf..dc93e3d80 100644 --- a/lib/WebGUI/Operation/Cron.pm +++ b/lib/WebGUI/Operation/Cron.pm @@ -96,7 +96,7 @@ sub www_editCronJob { ); my $value = $cron->get("workflowId") if defined $cron; my $type = "None"; - if (defined $cron) { + if (defined $cron && $cron->get("className")) { $type = $cron->get("className"); } $f->workflow( diff --git a/lib/WebGUI/Workflow.pm b/lib/WebGUI/Workflow.pm index 38682d7f5..db25b0fda 100644 --- a/lib/WebGUI/Workflow.pm +++ b/lib/WebGUI/Workflow.pm @@ -230,8 +230,11 @@ sub getList { my $session = shift; my $type = shift; my $sql = "select workflowId, title from Workflow where enabled=1"; - $sql .= " and type=?" if ($type); - return $session->db->buildHashRef($sql, [$type]); + if ($type) { + $sql .= " and type=?"; + $type = [$type]; + } + return $session->db->buildHashRef($sql, $type); }