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 =cut
sub canAdd { sub canAdd {
my $self = shift; my $className = shift;
my $userId = shift || $session{user}{userId}; my $userId = shift || $session{user}{userId};
my $className = $self->definition->[0]->{className}; my $subclassGroupId = shift;
my $groupId = $session{config}{assetAddPrivilege}{$className} || shift || '12'; my $groupId = $session{config}{assetAddPrivilege}{$className} || $subclassGroupId || '12';
return WebGUI::Grouping::isInGroup($groupId,$userId); return WebGUI::Grouping::isInGroup($groupId,$userId);
} }
@ -730,6 +730,12 @@ sub getAssetAdderLinks {
} else { } else {
next if ($uiLevel > $session{user}{uiLevel}); 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()}; my $label = eval{$class->getName()};
if ($@) { if ($@) {
WebGUI::ErrorHandler::error("Couldn't get the name of ".$class." because ".$@); 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)"); 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) { while (my ($class,$id) = $sth->array) {
my $asset = WebGUI::Asset->newByDynamicClass($id,$class); 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); my $url = $self->getUrl("func=add&class=".$class."&prototype=".$id);
$url = WebGUI::URL::append($url,$addToUrl) if ($addToUrl); $url = WebGUI::URL::append($url,$addToUrl) if ($addToUrl);
$links{$asset->getTitle}{url} = $url; $links{$asset->getTitle}{url} = $url;

7
lib/WebGUI/Config.pm
View file

@ -150,11 +150,16 @@ sub readConfig {
foreach my $key ($config->directives) { foreach my $key ($config->directives) {
$data{$key} = $config->get($key); $data{$key} = $config->get($key);
} }
foreach my $directive (qw(assetAddPrivilege assets utilityAssets assetContainers authMethods paymentPlugins)) { foreach my $directive (qw(assets utilityAssets assetContainers authMethods paymentPlugins)) {
if (ref $data{$directive} ne "ARRAY") { if (ref $data{$directive} ne "ARRAY") {
$data{$directive} = [$data{$directive}]; $data{$directive} = [$data{$directive}];
} }
} }
foreach my $directive (qw(assetAddPrivilege macros)) {
if (ref $data{$directive} ne "HASH") {
$data{$directive} = {};
}
}
if( defined( $data{scripturl} ) ) { if( defined( $data{scripturl} ) ) {
# get rid of leading "/" if present. # get rid of leading "/" if present.
$data{scripturl} =~ s/^\///; $data{scripturl} =~ s/^\///;

10
lib/WebGUI/ErrorHandler.pm
View file

@ -280,19 +280,19 @@ Creates an HTML formatted string
sub showDebug { sub showDebug {
my $text = $WebGUI::Session::session{debug}{'error'}; my $text = $WebGUI::Session::session{debug}{'error'};
$text =~ s/\n/\<br \/\>\n/g; $text =~ s/\n/\<br \/\>\n/g;
my $output = '<div style="background-color: #800000;color: #ffffff;">'.$text."</div>\n"; my $output = '<div style="margin-left:15px;background-color: #800000;color: #ffffff;">'.$text."</div>\n";
$text = $WebGUI::Session::session{debug}{'warn'}; $text = $WebGUI::Session::session{debug}{'warn'};
$text =~ s/\n/\<br \/\>\n/g; $text =~ s/\n/\<br \/\>\n/g;
$output .= '<div style="background-color: #ffdddd;color: #000000;">'.$text."</div>\n"; $output .= '<div style="margin-left:15px;background-color: #ffdddd;color: #000000;">'.$text."</div>\n";
$text = $WebGUI::Session::session{debug}{'info'}; $text = $WebGUI::Session::session{debug}{'info'};
$text =~ s/\n/\<br \/\>\n/g; $text =~ s/\n/\<br \/\>\n/g;
$output .= '<div style="background-color: #ffffdd;color: #000000;">'.$text."</div>\n"; $output .= '<div style="margin-left:15px;background-color: #ffffdd;color: #000000;">'.$text."</div>\n";
$text = $WebGUI::Session::session{debug}{'debug'}; $text = $WebGUI::Session::session{debug}{'debug'};
$text =~ s/\n/\<br \/\>\n/g; $text =~ s/\n/\<br \/\>\n/g;
$output .= '<div style="background-color: #dddddd;color: #000000;">'.$text."</div>\n"; $output .= '<div style="margin-left:15px;background-color: #dddddd;color: #000000;">'.$text."</div>\n";
$text = getSessionVars(); $text = getSessionVars();
$text =~ s/\n/\<br \/\>\n/g; $text =~ s/\n/\<br \/\>\n/g;
$output .= '<div style="background-color: #ffffff;color: #000000;">'.$text."</div>\n"; $output .= '<div style="margin-left:15px;background-color: #ffffff;color: #000000;">'.$text."</div>\n";
return $output; return $output;
} }