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

fixed a couple more bugs

Browse source
This commit is contained in:
JT Smith 2005-04-23 19:18:42 +00:00
parent 2946331b66
commit a5b07a2599
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/WebGUI/Asset.pm
View file

@ -205,10 +205,10 @@ Only developers extending this method should use this parameter. By default WebG
=cut
sub canAdd {
my $self = shift;
my $className = shift;
my $userId = shift || $session{user}{userId};
my $className = $self->definition->[0]->{className};
my $groupId = $session{config}{assetAddPrivilege}{$className} || shift || '12';
my $subclassGroupId = shift;
my $groupId = $session{config}{assetAddPrivilege}{$className} || $subclassGroupId || '12';
return WebGUI::Grouping::isInGroup($groupId,$userId);
}
@ -730,6 +730,12 @@ sub getAssetAdderLinks {
} else {
next if ($uiLevel > $session{user}{uiLevel});
}
my $canAdd = eval{$class->canAdd()};
if ($@) {
WebGUI::ErrorHandler::error("Couldn't determine if user can add ".$class." because ".$@);
} else {
next unless ($canAdd);
}
my $label = eval{$class->getName()};
if ($@) {
WebGUI::ErrorHandler::error("Couldn't get the name of ".$class." because ".$@);
@ -753,6 +759,7 @@ sub getAssetAdderLinks {
my $sth = WebGUI::SQL->read("select className,assetId from asset where isPrototype=1 and state='published' and className in ($constraint)");
while (my ($class,$id) = $sth->array) {
my $asset = WebGUI::Asset->newByDynamicClass($id,$class);
next unless ($asset->canView && $asset->canAdd && $asset->getUiLevel <= $session{user}{uiLevel});
my $url = $self->getUrl("func=add&class=".$class."&prototype=".$id);
$url = WebGUI::URL::append($url,$addToUrl) if ($addToUrl);
$links{$asset->getTitle}{url} = $url;