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

Made Survey upgrades conditional in upgrade script because my 7.7.6 upgrades got

Browse source 
committed halfway through the release process.
This commit is contained in:
Patrick Donelan 2009-05-20 10:17:31 +00:00
parent 8373eaf585
commit c64a1de9f3
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
docs/upgrades/upgrade_7.7.6-7.7.7.pl
View file

@ -35,6 +35,7 @@ addUseEmailAsUsernameToSettings( $session );
alterVATNumberTable( $session ); alterVATNumberTable( $session );
addRedirectAfterLoginUrlToSettings( $session ); addRedirectAfterLoginUrlToSettings( $session );
addSurveyTestResultsTemplateColumn( $session ); addSurveyTestResultsTemplateColumn( $session );
updateSurveyTest( $session );
fixSMSUserProfileI18N($session); fixSMSUserProfileI18N($session);
addEmsScheduleColumns ($session); addEmsScheduleColumns ($session);
addMapAsset( $session ); addMapAsset( $session );
@ -107,11 +108,23 @@ sub alterVATNumberTable {
sub addSurveyTestResultsTemplateColumn { sub addSurveyTestResultsTemplateColumn {
my $session = shift; my $session = shift;
print "\tAdding columns for Survey Test Results Template..." unless $quiet; 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; 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 { sub installFilePumpAdminGroup {
my $session = shift; my $session = shift;

2
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -2701,7 +2701,7 @@ sub www_runTest {
} }
my $ac = $self->getAdminConsole; 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); my $edit = WebGUI::International->new($self->session, "WebGUI")->get(575);
$ac->addSubmenuItem($self->session->url->page("func=editTest;testId=$id"), "$edit Test"); $ac->addSubmenuItem($self->session->url->page("func=editTest;testId=$id"), "$edit Test");
return $ac->render($out, 'Test Results'); return $ac->render($out, 'Test Results');