diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index b7dd101df..c300745e2 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -2,6 +2,7 @@ - Added macro to return the MIME type to a file, FetchMimeType. - fix [ 1378493 ] 6.7.8 collab post edits (images) - Fixed bug where viewProfile did not show pretty printed values + - fix [ 1344146 ] deleting recurring events doesn't work - Fixed bug/rfe where it was not obvious when hovering over the rank column in the Asset Manager that you can drag rows up and down. Added cursor:move to the td's style. diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 092e0e388..f6b9d152d 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -255,11 +255,9 @@ sub www_deleteEventConfirm { my $self = shift; return WebGUI::Privilege::insufficient() unless ($self->canEdit); if (($session{form}{rid} ne "") and ($session{form}{rid} ne "0")) { - my $where = "EventsCalendar_event.EventsCalendar_recurringId=".quote($session{form}{rid}); - my $series = $self->getParent->getLineage(["descendants"],{returnObjects=>1, - joinClass=>"WebGUI::Asset::Event",whereClause=>$where}); - foreach my $trashedEvent (@{$series}) { - $trashedEvent->trash; + my $series = $self->getParent->getLineage(["descendants"],{returnObjects=>1}); + foreach my $event (@{$series}) { + $event->trash if $trashedEvent->get("EventsCalendar_recurringId") eq $session{form}{rid}; } } else { $self->trash;