diff --git a/application/models/rows/CourseCrosslisting.php b/application/models/rows/CourseCrosslisting.php index f2f3e998888faa6a2d3fd1b81d68c3c03d42dbb8..b7794e0ff3044d265c11d77398471a403b59a8aa 100644 --- a/application/models/rows/CourseCrosslisting.php +++ b/application/models/rows/CourseCrosslisting.php @@ -22,6 +22,7 @@ class CourseCrosslisting extends Nmc_Db_Table_Row $courseCodeRelation = new Nmc_Db_Table_Relation_HasOne(CourseCodes::getInstance(), $this, 'course_code', 'courseCode', true); + $courseCodeRelation->setDoNotClone(); $this->_registerRelation($courseCodeRelation); } diff --git a/application/models/rows/CourseGeneration.php b/application/models/rows/CourseGeneration.php index 3ce99cc184e0d839bb83e721c3cce05cb2a2e7b3..fe4bdd3cb9a776e38fd0413df2b6adc401ce6ed9 100644 --- a/application/models/rows/CourseGeneration.php +++ b/application/models/rows/CourseGeneration.php @@ -153,6 +153,9 @@ class CourseGeneration extends Asset public function isEssentialStudies($college = null) { + if (is_null($this->_homeCrosslisting->courseCode)) { + return false; + } return CourseEsDesignations::getInstance()->isCourseCodeEssentialStudies($this->_homeCrosslisting->courseCode); } diff --git a/application/views/request/bulletinEntry.xhtml b/application/views/request/bulletinEntry.xhtml index e751cc0c0a01e755cf588e6c2d442af74b78f996..55d4826450573eda1f32396b2d4a2765a09702a9 100644 --- a/application/views/request/bulletinEntry.xhtml +++ b/application/views/request/bulletinEntry.xhtml @@ -10,7 +10,7 @@ echo '[ES]'; } - if ($course->integratedStudies == true) { + if ($course->integratedStudies == 'yes') { echo '[IS]'; } ?> @@ -21,7 +21,9 @@ // course number with same-subject crosslistings if( in_array('Classroom', $course->deliveryMethods) - || in_array('Web', $course->deliveryMethods)) { + || in_array('Web', $course->deliveryMethods) + || $course->deliveryMethods[0] == '' + || count($course->deliveryMethods) == 0) { echo $course->courseNumber . $course->courseLetter; foreach($course->crosslistings as $crosslisting) { if($crosslisting->type == 'home listing') {