From a71e494d34730535f8e51bf9069524016963804c Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 3 Dec 2008 00:02:01 +0000 Subject: [PATCH] Fix Calendar copy behavior. By default, duplicate will only copy the Calendar. duplicateBranch must be called to copy it _and_ its children. --- docs/changelog/7.x.x.txt | 3 +++ lib/WebGUI/Asset/Wobject/Calendar.pm | 28 ---------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index b0bf4a6e9..c19e91735 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -21,6 +21,9 @@ - fixed #4209: i18n in Rich edit in Dutch breaks - fixed #9196: Shelf lacks pagination - fixed #4208: EMS badges with Admin security visible to all + - fixed Calendar copy behavior. In the Asset toolbar, Copy Just this Asset + was broken. This has been fixed. As a side effect, in the Asset Manager + the default behavior is to copy ONLY the Calendar, and none of the events. 7.6.4 - Survey now will show progress and time limit. diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm index 0631eed18..f03a59a3a 100644 --- a/lib/WebGUI/Asset/Wobject/Calendar.pm +++ b/lib/WebGUI/Asset/Wobject/Calendar.pm @@ -459,34 +459,6 @@ sub createSubscriptionGroup { #---------------------------------------------------------------------------- -=head2 duplicate ( ) - -Duplicates an Event Calendar. Duplicates all the events in this Event Calendar. - -=cut - -sub duplicate { - my $self = shift; - - # Superclass duplicates the calendar - my $newCalendar = $self->SUPER::duplicate(@_); - - # Duplicate the events in this calendar - my $events = $self->getLineage(["descendants"], { - returnObjects => 1, - includeOnlyClasses => ['WebGUI::Asset::Event'], - }); - - for my $event (@{ $events }) { - my %eventProperties = %{ $event->get() }; - $newCalendar->addChild(\%eventProperties); - } - - return $newCalendar; -} - -#---------------------------------------------------------------------------- - =head2 getEditForm Adds an additional tab for feeds.