Commit events created by the ExtendCalendarRecurrences workflow activity. Fixes bug #11994.
This commit is contained in:
parent
3e0da41f0a
commit
b911f05125
3 changed files with 30 additions and 13 deletions
|
|
@ -38,9 +38,13 @@ my $event = $calendar->addChild(
|
|||
{ className => 'WebGUI::Asset::Event',
|
||||
startDate => $one_year_ago,
|
||||
endDate => $one_year_ago,
|
||||
}
|
||||
}, undef, undef, {skipAutoCommitWorkflows => 1, }
|
||||
);
|
||||
|
||||
$tag->commit;
|
||||
$calendar = $calendar->cloneFromDb;
|
||||
$event = $event->cloneFromDb;
|
||||
|
||||
my $recurId = $event->setRecurrence(
|
||||
{ recurType => 'monthDay',
|
||||
every => 2,
|
||||
|
|
@ -87,17 +91,21 @@ while (my $status = $instance->run ne 'complete') {
|
|||
$instance->run;
|
||||
}
|
||||
|
||||
my $sql = q{
|
||||
select e.startDate, e.endDate
|
||||
from asset a
|
||||
inner join Event e on e.assetId = a.assetId
|
||||
and a.parentId = ?
|
||||
order by e.startDate
|
||||
};
|
||||
#my $sql = q{
|
||||
# select e.startDate, e.endDate
|
||||
# from asset a
|
||||
# inner join Event e on e.assetId = a.assetId
|
||||
# and a.parentId = ?
|
||||
# order by e.startDate
|
||||
#};
|
||||
|
||||
my $dates = $session->db->buildArrayRefOfHashRefs($sql, [$calendar->getId]);
|
||||
#my $dates = $session->db->buildArrayRefOfHashRefs($sql, [$calendar->getId]);
|
||||
my $dates = $calendar->getLineage(['children'], { returnObjects => 1, });
|
||||
# 3 years at every other month (6 times) plus the one we started with
|
||||
is(@$dates, 19, 'created right number of dates') or diag Dumper $dates;
|
||||
is(@{$dates}, 19, 'created right number of dates') or diag Dumper $dates;
|
||||
|
||||
my @uncommitted_events = grep { $_->get('status') ne 'approved' } @{ $dates };
|
||||
is @uncommitted_events, 0, 'all events are committed (approved)';
|
||||
|
||||
done_testing;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue