diff --git a/docs/upgrades/upgrade_7.7.6-7.7.7.pl b/docs/upgrades/upgrade_7.7.6-7.7.7.pl index d42232047..d1f32a3d1 100644 --- a/docs/upgrades/upgrade_7.7.6-7.7.7.pl +++ b/docs/upgrades/upgrade_7.7.6-7.7.7.pl @@ -35,6 +35,7 @@ addUseEmailAsUsernameToSettings( $session ); alterVATNumberTable( $session ); addRedirectAfterLoginUrlToSettings( $session ); addSurveyTestResultsTemplateColumn( $session ); +updateSurveyTest( $session ); fixSMSUserProfileI18N($session); addEmsScheduleColumns ($session); addMapAsset( $session ); @@ -107,11 +108,23 @@ sub alterVATNumberTable { sub addSurveyTestResultsTemplateColumn { my $session = shift; print "\tAdding columns for Survey Test Results Template..." unless $quiet; - $session->db->write("alter table Survey add column `testResultsTemplateId` char(22)"); + my $sth = $session->db->read('describe Survey testResultsTemplateId'); + if (! defined $sth->hashRef) { + $session->db->write("alter table Survey add column `testResultsTemplateId` char(22)"); + } print "Done\n" unless $quiet; } +#---------------------------------------------------------------------------- +sub updateSurveyTest { + my $session = shift; + print "\tUpdate Survey test table, via Crud... " unless $quiet; + use WebGUI::Asset::Wobject::Survey::Test; + WebGUI::Asset::Wobject::Survey::Test->crud_updateTable($session); + print "DONE!\n" unless $quiet; +} + #---------------------------------------------------------------------------- sub installFilePumpAdminGroup { my $session = shift; diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index 1d7b8f687..a3380bc0d 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -2701,7 +2701,7 @@ sub www_runTest { } my $ac = $self->getAdminConsole; - my $out = $self->processTemplate($var, $self->get('testResultsTemplateId')); + my $out = $self->processTemplate($var, $self->get('testResultsTemplateId') || 'S3zpVitAmhy58CAioH359Q'); my $edit = WebGUI::International->new($self->session, "WebGUI")->get(575); $ac->addSubmenuItem($self->session->url->page("func=editTest;testId=$id"), "$edit Test"); return $ac->render($out, 'Test Results');