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

fixed #12129: AdminBar calls canAdd as an object method

Browse source
This commit is contained in:
Paul Driver 2011-05-16 16:10:18 -05:00
parent 0df9fb747a
commit c1a29182ca
4 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Asset.pm
View file

@ -226,6 +226,10 @@ The "turn admin on" group which is group id 12.
sub canAdd {
my $className = shift;
# just in case we get called as object method
$className = $className->get('className') if blessed $className;
my $session = shift;
my $userId = shift || $session->user->userId;
my $user = WebGUI::User->new($session, $userId);

5
lib/WebGUI/Macro/AdminBar.pm
View file

@ -160,12 +160,13 @@ sub process {
# prototypes
foreach my $prototype (@{ $session->asset->getPrototypeList }) {
next unless ($prototype->canView && $prototype->canAdd($session) && $prototype->getUiLevel <= $userUiLevel);
my $class = $prototype->get('className');
next unless ($prototype->canView && $class->canAdd($session) && $prototype->getUiLevel <= $userUiLevel);
$categories{prototypes}{items} ||= [];
push @{$categories{prototypes}{items}}, {
title => $prototype->getTitle,
url => $asset->getUrl(
"func=add;class=".$prototype->get('className').";prototype=".$prototype->getId.$proceed
"func=add;class=$class;prototype=".$prototype->getId.$proceed
),
icon => $prototype->getIcon(1),
};