Add enableSurveyExpressionEngine to default WebGUI conf file.
Rerun the upgrade subroutine to handle newer surveys. Handle the config option being off in Survey/Test.t
This commit is contained in:
parent
b74761619e
commit
67cce548ff
3 changed files with 16 additions and 0 deletions
|
|
@ -88,6 +88,14 @@ sub addOgoneToConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#----------------------------------------------------------------------------
|
||||||
|
sub addSurveyExpressionEngineConfigFlag{
|
||||||
|
my $session = shift;
|
||||||
|
print "\tAdding enableSurveyExpressionEngine config option... " unless $quiet;
|
||||||
|
$session->config->set('enableSurveyExpressionEngine', 0);
|
||||||
|
print "Done.\n" unless $quiet;
|
||||||
|
}
|
||||||
|
|
||||||
# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
|
# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
|
||||||
|
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -195,6 +195,11 @@
|
||||||
"WebGUI::Asset::Template::HTMLTemplate"
|
"WebGUI::Asset::Template::HTMLTemplate"
|
||||||
],
|
],
|
||||||
|
|
||||||
|
# Enable the Survey Expression Engine, which allows goto expressions in
|
||||||
|
# the config.
|
||||||
|
|
||||||
|
"enableSurveyExpressionEngine" : 0,
|
||||||
|
|
||||||
# Specify the default template parser.
|
# Specify the default template parser.
|
||||||
|
|
||||||
"defaultTemplateParser" : "WebGUI::Asset::Template::HTMLTemplate",
|
"defaultTemplateParser" : "WebGUI::Asset::Template::HTMLTemplate",
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,9 @@ my $user = WebGUI::User->new( $session, 'new' );
|
||||||
WebGUI::Test->usersToDelete($user);
|
WebGUI::Test->usersToDelete($user);
|
||||||
my $import_node = WebGUI::Asset->getImportNode($session);
|
my $import_node = WebGUI::Asset->getImportNode($session);
|
||||||
|
|
||||||
|
WebGUI::Test->originalConfig('enableSurveyExpressionEngine');
|
||||||
|
$session->config->set('enableSurveyExpressionEngine', 1);
|
||||||
|
|
||||||
# Create a Survey
|
# Create a Survey
|
||||||
$s = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
|
$s = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
|
||||||
isa_ok( $s, 'WebGUI::Asset::Wobject::Survey' );
|
isa_ok( $s, 'WebGUI::Asset::Wobject::Survey' );
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue