diff --git a/docs/upgrades/packages-7.6.4/root_import_survey.wgpkg b/docs/upgrades/packages-7.6.4/root_import_survey.wgpkg index ebdf80a21..868cb8268 100644 Binary files a/docs/upgrades/packages-7.6.4/root_import_survey.wgpkg and b/docs/upgrades/packages-7.6.4/root_import_survey.wgpkg differ diff --git a/docs/upgrades/upgrade_7.6.3-7.6.4.pl b/docs/upgrades/upgrade_7.6.3-7.6.4.pl index 09f1f179c..7915cb68f 100644 --- a/docs/upgrades/upgrade_7.6.3-7.6.4.pl +++ b/docs/upgrades/upgrade_7.6.3-7.6.4.pl @@ -442,6 +442,7 @@ sub _addSurveyTables{ $session->db->write(" CREATE TABLE `Survey` ( `groupToTakeSurvey` char(22) character set utf8 collate utf8_bin NOT NULL default '2', + `groupToEditSurvey` char(22) character set utf8 collate utf8_bin NOT NULL default '3', `groupToViewReports` char(22) character set utf8 collate utf8_bin NOT NULL default '3', `responseTemplateId` char(22) character set utf8 collate utf8_bin NOT NULL, `overviewTemplateId` char(22) character set utf8 collate utf8_bin NOT NULL, diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index e4a7d917d..eca5e75ba 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -588,7 +588,7 @@ sub www_takeSurvey { } }; - return $self->session->style->process($out,$self->getValue("styleTemplateId")); + return $self->session->style->process($out,$self->get("styleTemplateId")); } #handles questions that were submitted diff --git a/www/extras/wobject/Survey/administersurvey.js b/www/extras/wobject/Survey/administersurvey.js index 737a3f980..73c7400a1 100644 --- a/www/extras/wobject/Survey/administersurvey.js +++ b/www/extras/wobject/Survey/administersurvey.js @@ -52,7 +52,7 @@ Survey.Form = new function() { span.innerHTML = ""; span.style.display = 'block'; - document.getElementById('header').appendChild(span); + document.getElementById('survey-header').appendChild(span); YAHOO.util.Event.addListener("showQuestionsButton", "click", function(){ document.getElementById('showQuestionsButton').style.display = 'none'; diff --git a/www/extras/wobject/Survey/survey.css b/www/extras/wobject/Survey/survey.css index 6baeb76f0..2ff7b86a8 100644 --- a/www/extras/wobject/Survey/survey.css +++ b/www/extras/wobject/Survey/survey.css @@ -3,7 +3,7 @@ body { background-repeat: repeat-y; background-position: 0px 0px; } -.header { +.survey-header { width: 80%; height: 20px; margin-left: 80px;