- fix [ 1344146 ] deleting recurring events doesn't work

This commit is contained in:
Matthew Wilson 2005-12-12 04:56:37 +00:00
parent ea85a42fca
commit f413489b49
2 changed files with 4 additions and 5 deletions

View file

@ -2,6 +2,7 @@
- Added macro to return the MIME type to a file, FetchMimeType. - Added macro to return the MIME type to a file, FetchMimeType.
- fix [ 1378493 ] 6.7.8 collab post edits (images) - fix [ 1378493 ] 6.7.8 collab post edits (images)
- Fixed bug where viewProfile did not show pretty printed values - 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 - 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. column in the Asset Manager that you can drag rows up and down.
Added cursor:move to the td's style. Added cursor:move to the td's style.

View file

@ -255,11 +255,9 @@ sub www_deleteEventConfirm {
my $self = shift; my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit); return WebGUI::Privilege::insufficient() unless ($self->canEdit);
if (($session{form}{rid} ne "") and ($session{form}{rid} ne "0")) { 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});
my $series = $self->getParent->getLineage(["descendants"],{returnObjects=>1, foreach my $event (@{$series}) {
joinClass=>"WebGUI::Asset::Event",whereClause=>$where}); $event->trash if $trashedEvent->get("EventsCalendar_recurringId") eq $session{form}{rid};
foreach my $trashedEvent (@{$series}) {
$trashedEvent->trash;
} }
} else { } else {
$self->trash; $self->trash;