oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rework how validParent works, and where it is checked. Add an explicit check for it in addChild, and remove a bunch of overridden addChild methods.

Browse source
This commit is contained in:
Colin Kuskie 2010-03-19 14:31:49 -07:00
parent a8496c4d15
commit 88ec09d279
12 changed files with 78 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/WebGUI/AssetLineage.pm
View file

@ -71,12 +71,17 @@ sub addChild {
my $id = shift || $session->id->generate();
my $now = shift || $session->datetime->time();
my $options = shift;
# Check for valid parentage using validParent on child's class
if (! $properties->{className}->validParent($session, $self)) {
return undef;
}
# Check if it is possible to add a child to this asset. If not add it as a sibling of this asset.
if (length($self->lineage) >= 252) {
$session->errorHandler->warn('Tried to add child to asset "'.$self->getId.'" which is already on the deepest level. Adding it as a sibling instead.');
return $self->getParent->addChild($properties, $id, $now, $options);
}
my $lineage = $self->lineage.$self->getNextChildRank;
$self->{_hasChildren} = 1;
$session->db->beginTransaction;
@ -973,6 +978,32 @@ sub swapRank {
}
#-------------------------------------------------------------------
=head2 validParent ([$asset])
Find out whether a potential parent can have this asset as a child.
This is a class method.
=head3 $asset
The potential parent. If not passed, uses $session->asset;
=cut
sub validParent {
my $class = shift;
my $session = shift;
my $asset = shift || $session->asset;
my $parent_classes = $class->valid_parent_classes;
my $valid_parent = 0;
foreach my $parentClass (@{ $class->valid_parent_classes}) {
return 1 if $class->isa($parentClass);
}
return 0;
}
#-------------------------------------------------------------------
=head2 www_demote ( )