From 0f10c7f73fdb83459aa902e6fe7b2d64254cfb8b Mon Sep 17 00:00:00 2001
From: Roger Feese <rfeese@unl.edu>
Date: Mon, 25 Aug 2014 16:02:49 -0500
Subject: [PATCH] If there is no course id in the request (such as a new course
request), don't try to load ace recert data.
---
application/modules/courses/models/CourseModel.php | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/application/modules/courses/models/CourseModel.php b/application/modules/courses/models/CourseModel.php
index 931de27a..d7f4c1a7 100644
--- a/application/modules/courses/models/CourseModel.php
+++ b/application/modules/courses/models/CourseModel.php
@@ -3925,11 +3925,13 @@ class Courses_CourseModel extends Unl_Model
// invalid ace recertification array, reset
$this->_data['aceRecertification'] = null;
}
- } else {
- $select = new Zend_Db_Select($db);
- $select->from(array('a' => 'creqCourseAceRecertifications'));
- $select->where('a.generation = ?', $this->_data['course']);
- $record = $select->query()->fetch();
+ } else {
+ if($this->_data['course']){ // if there is an existing course this request refers to
+ $select = new Zend_Db_Select($db);
+ $select->from(array('a' => 'creqCourseAceRecertifications'));
+ $select->where('a.generation = ?', $this->_data['course']);
+ $record = $select->query()->fetch();
+ }
if($record){
// for AceRecertification record, get the questions and answers
@@ -3962,6 +3964,7 @@ class Courses_CourseModel extends Unl_Model
}
}
+ // No previous ace recertification data found -- Last resort is to just load the most recent question set version.
if (!is_array($this->_data['aceRecertification'])) {
// load current empty question set
//SELECT q.* FROM creq.creqCourseAceRecertifyQuestionSets as s
--
GitLab