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

fix a couple minor syntax issues

Browse source
This commit is contained in:
Graham Knop 2008-09-17 15:37:42 +00:00
parent b9d7008001
commit 1ce7d42a62
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/WebGUI/Help/Asset_Survey.pm
View file

@ -55,16 +55,16 @@ our $HELP = {
], ],
}, },
], ],
{ 'name' => 'question_loop', },
'variables' => [ { 'name' => 'question_loop',
{ 'name' => 'question.question' }, 'variables' => [
{ 'name' => 'question.allowComment' }, { 'name' => 'question.question' },
{ 'name' => 'question.id' }, { 'name' => 'question.allowComment' },
{ 'name' => 'question.comment.field' }, { 'name' => 'question.id' },
{ 'name' => 'question.comment.label' }, { 'name' => 'question.comment.field' },
{ 'name' => 'question.answer.field' } { 'name' => 'question.comment.label' },
] { 'name' => 'question.answer.field' }
}, ]
}, },
], ],
related => [] related => []

7
lib/WebGUI/Search.pm
View file

@ -17,6 +17,7 @@ package WebGUI::Search;
use strict; use strict;
use Carp qw( croak ); use Carp qw( croak );
use WebGUI::Asset; use WebGUI::Asset;
use WebGUI::Pluggable;
=head1 NAME =head1 NAME
@ -429,9 +430,9 @@ sub search {
if (exists $rules->{joinClass}) { if (exists $rules->{joinClass}) {
my $join = [ "left join assetData on assetIndex.assetId=assetData.assetId" ]; my $join = [ "left join assetData on assetIndex.assetId=assetData.assetId" ];
for my $className ( @{ $rules->{ joinClass } } ) { for my $className ( @{ $rules->{ joinClass } } ) {
my $cmd = "use " . $className; if ( ! eval { WebGUI::Pluggable::load($className) } ) {
eval { $cmd }; $self->session->errorHandler->fatal($@);
$self->session->errorHandler->fatal("Couldn't compile asset package: ".$className.". Root cause: ".$@) if ($@); }
foreach my $definition (@{$className->definition($self->session)}) { foreach my $definition (@{$className->definition($self->session)}) {
unless ($definition->{tableName} eq "asset") { unless ($definition->{tableName} eq "asset") {
my $tableName = $definition->{tableName}; my $tableName = $definition->{tableName};