From c55feb8bcde114492c0754c724f85e574bb150e8 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Thu, 7 Dec 2006 00:07:48 +0000
Subject: [PATCH] Fix: Added appropriate workflow activities for new Calendar

---
 docs/upgrades/upgrade_7.2.3-7.3.0.pl                | 6 ++++++
 lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/upgrades/upgrade_7.2.3-7.3.0.pl b/docs/upgrades/upgrade_7.2.3-7.3.0.pl
index 9019bb98c..c1a5fe1be 100644
--- a/docs/upgrades/upgrade_7.2.3-7.3.0.pl
+++ b/docs/upgrades/upgrade_7.2.3-7.3.0.pl
@@ -188,6 +188,12 @@ ENDSQL
 );
 	
 	$session->config->addToArray('assets', 'WebGUI::Asset::Wobject::Calendar');
+	
+	my $workflows = $session->config->get("workflowActivities");
+	push @{$workflows->{None}},"WebGUI::Workflow::Activity::CalendarUpdateFeeds";
+	$session->config->set("workflowActivities",$workflows);
+	
+	WebGUI::Workflow::new("pbworkflow000000000004")->addActivity($session,"WebGUI::Workflow::Activity::CalendarUpdateFeeds");
 }
 
 
diff --git a/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm b/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm
index 408f08ebb..dbd204a4a 100755
--- a/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm
+++ b/lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm
@@ -78,6 +78,8 @@ sub execute {
 	my $self = shift;
 	$self->session->user({userId => 3});
 	
+### TODO: If we take more than a minute, return WAITING so that some
+# other activity can run
 	
 	my $ua		= LWP::UserAgent->new(agent => "WebGUI");
 	my $dt		= WebGUI::DateTime->new(time)->toMysql;
@@ -288,7 +290,6 @@ sub execute {
 					if ($event)
 					{
 						$event->update($properties);
-						$event->requestCommit;
 						$updated++;
 					}
 				}
@@ -296,7 +297,6 @@ sub execute {
 				{
 					my $calendar	= WebGUI::Asset->newByDynamicClass($self->session,$feed->{assetId});
 					my $event	= $calendar->addChild($properties);
-					$event->requestCommit;
 					$added++;
 				}