From cd0fbf8ecb0ce81ef459ce3a6ed193dd1b1ffca3 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 19 Apr 2010 10:21:57 -0700 Subject: [PATCH] Remove subclassed methods validParent and addChild from GalleryFile and Gallery. --- lib/WebGUI/Asset/File/GalleryFile.pm | 13 ------------- lib/WebGUI/Asset/Wobject/Gallery.pm | 28 ---------------------------- 2 files changed, 41 deletions(-) diff --git a/lib/WebGUI/Asset/File/GalleryFile.pm b/lib/WebGUI/Asset/File/GalleryFile.pm index f812a69ba..3325cdb6a 100644 --- a/lib/WebGUI/Asset/File/GalleryFile.pm +++ b/lib/WebGUI/Asset/File/GalleryFile.pm @@ -827,19 +827,6 @@ sub valid_parent_classes { #---------------------------------------------------------------------------- -=head2 validParent ( ) - -Override validParent to only allow GalleryAlbums to hold GalleryFiles. - -=cut - -sub validParent { - my ($class, $session) = @_; - return $session->asset->isa('WebGUI::Asset::Wobject::GalleryAlbum'); -} - -#---------------------------------------------------------------------------- - =head2 view ( ) method called by the container www_view method. diff --git a/lib/WebGUI/Asset/Wobject/Gallery.pm b/lib/WebGUI/Asset/Wobject/Gallery.pm index b19322bfa..385d8d61f 100644 --- a/lib/WebGUI/Asset/Wobject/Gallery.pm +++ b/lib/WebGUI/Asset/Wobject/Gallery.pm @@ -342,34 +342,6 @@ use WebGUI::HTML; #---------------------------------------------------------------------------- -=head2 addChild ( properties, [...] ) - -Add a child to this asset. See C for more info. - -Overridden to ensure that only GalleryAlbums are added to Galleries. - -=cut - -sub addChild { - my $self = shift; - my $properties = shift; - my $albumClass = "WebGUI::Asset::Wobject::GalleryAlbum"; - - # Load the class - WebGUI::Pluggable::load( $properties->{className} ); - - if ( !$properties->{className}->isa( $albumClass ) ) { - $self->session->errorHandler->security( - "add a ".$properties->{className}." to a ".$self->className - ); - return undef; - } - - return $self->next::method( $properties, @_ ); -} - -#---------------------------------------------------------------------------- - =head2 appendTemplateVarsSearchForm ( var ) Appends the template vars for the search form to the hash reference C.