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

rfe #640: Refactored autocommit and autocomment

Browse source 
Autocommit assets like CS posts or Calendar Events can now be added before the
parent is committed.  They will go into the same version tag as their parent.
This commit is contained in:
Graham Knop 2008-10-22 16:04:10 +00:00
parent 71fc839c83
commit 99a9da626d
22 changed files with 218 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm
View file

@ -25,7 +25,7 @@ use WebGUI::DateTime;
use DateTime::TimeZone;
use LWP::UserAgent;
use JSON qw(encode_json decode_json);
use JSON ();
=head1 NAME
@ -91,8 +91,8 @@ sub execute {
my $eventList = [];
my $feedList;
if ($instance->getScratch('events')) {
$eventList = decode_json($instance->getScratch('events'));
$feedList = decode_json($instance->getScratch('feeds'));
$eventList = JSON::from_json($instance->getScratch('events'));
$feedList = JSON::from_json($instance->getScratch('feeds'));
}
else {
my $ua = LWP::UserAgent->new(agent => "WebGUI");
@ -353,11 +353,22 @@ sub execute {
}
}
}
my $currentVersionTag = WebGUI::VersionTag->getWorking($self->session, 1);
if ($currentVersionTag) {
$currentVersionTag->clearWorking;
}
my $ttl = $self->getTTL;
while (@$eventList) {
if ($startTime + $ttl < time()) {
$instance->setScratch('events', encode_json($eventList));
$instance->setScratch('feeds', encode_json($feedList));
$instance->setScratch('events', JSON::to_json($eventList));
$instance->setScratch('feeds', JSON::to_json($feedList));
my $newVersionTag = WebGUI::VersionTag->getWorking($self->session, 1);
if ($newVersionTag) {
$newVersionTag->requestCommit;
}
if ($currentVersionTag) {
$currentVersionTag->setWorking;
}
return $self->WAITING;
}
my $eventData = shift @$eventList;
@ -376,7 +387,6 @@ sub execute {
if ($event) {
$event->update($properties);
$event->requestAutoCommit;
$feed->{updated}++;
}
}
@ -384,10 +394,16 @@ sub execute {
my $calendar = WebGUI::Asset->newByDynamicClass($self->session,$feed->{assetId});
if (!defined $calendar) {
$self->session->errorHandler->error("CalendarUpdateFeeds Activity: Calendar object failed to instanciate. Did you commit the calendar wobject?");
my $newVersionTag = WebGUI::VersionTag->getWorking($self->session, 1);
if ($newVersionTag) {
$newVersionTag->requestCommit;
}
if ($currentVersionTag) {
$currentVersionTag->setWorking;
}
return $self->ERROR;
}
my $event = $calendar->addChild($properties);
$event->requestAutoCommit;
my $event = $calendar->addChild($properties, { skipAutoCommitWorkflows => 1});
$feed->{added}++;
if ($recur) {
$event->setRecurrence($recur);
@ -398,6 +414,13 @@ sub execute {
# TODO: Only update if last-updated field is
# greater than the event's lastUpdated property
}
my $newVersionTag = WebGUI::VersionTag->getWorking($self->session, 1);
if ($newVersionTag) {
$newVersionTag->requestCommit;
}
if ($currentVersionTag) {
$currentVersionTag->setWorking;
}
for my $feedId (keys %$feedList) {
my $feed = $feedList->{$feedId};
$self->session->db->write("update Calendar_feeds set lastResult=?,lastUpdated=? where feedId=?",