diff --git a/application/modules/courses/models/CourseModel.php b/application/modules/courses/models/CourseModel.php index 3bbb8f5b6787aa4e4b4634eef91245e765e3bd17..ff90d9a69ea68c3c686c4d9de86fc8e054ca9ef3 100644 --- a/application/modules/courses/models/CourseModel.php +++ b/application/modules/courses/models/CourseModel.php @@ -138,6 +138,7 @@ class Courses_CourseModel extends Unl_Model // for each AceRecertification record, get the questions and answers //SELECT q.*, a.* FROM creq.creqCourseAceRecertifyAnswers AS a //INNER JOIN creq.creqCourseAceRecertifyQuestions AS q ON a.questionId = q.courseAceRecertifyQuestionId + //INNER JOIN creq.creqCourseAceRecertifyQuestionSets AS s ON q.questionSetId = s.courseAceRecertifyQuestionSetId //WHERE a.recertificationId = 785 ORDER BY q.questionSort; $select = new Zend_Db_Select($db); $select->from(array('a' => 'creqCourseAceRecertifyAnswers')); diff --git a/application/modules/courses/views/scripts/edit/index.phtml b/application/modules/courses/views/scripts/edit/index.phtml index 1c732afdcd3bbd84257c46e9994d69ede46ab114..2bc11ec291e417db751345bb7391c7e4eeff8555 100644 --- a/application/modules/courses/views/scripts/edit/index.phtml +++ b/application/modules/courses/views/scripts/edit/index.phtml @@ -1171,7 +1171,7 @@ if (in_array($this->request->getType(), array('NewCourseWithACE', 'AddACEToCours <label for="ace-recertify-blackboardUpload" class="required"> By checking this box, as the submitter of this course for ACE Recertification, you agree to upload the electronic student work samples into the Blackboard - Content Collection folder. + Content Collection folder (if requested by the ACE committee). <?php $blackboardUpload = $this->course->getAceRecertificationBlackboardUpload(); echo $this->formCheckbox('ace[blackboardUpload]', $blackboardUpload, NULL, array('yes', 'no'));