diff --git a/application/controllers/RequestController.php b/application/controllers/RequestController.php index 08c9b5cebd72fc9c21d74edbfc650a54cf61417b..9c7b0894ffa7384b45d74d5245c6436924685508 100755 --- a/application/controllers/RequestController.php +++ b/application/controllers/RequestController.php @@ -50,12 +50,25 @@ class RequestController extends Nmc_Controller_Action Nmc_Registry_Session::getInstance()->erase('course'); } else { // course found + Nmc_Registry_Session::getInstance()->erase('course'); $out->page = 'request/course_found'; $parentCourse = $course->getParentCourse(); $course = clone $parentCourse; + if ($course->subject != $subject || + $course->courseNumber != $courseNumber || + $course->courseLetter != $courseLetter) + { + $out->crosslisting = true; + $out->homeSubject = $course->subject; + $out->homeCourseLetter = $course->courseLetter; + $out->homeCourseNumber = $course->courseNumber; + } else { + $out->crosslisting = false; + } + Nmc_Registry_Session::getInstance()->course = $course; } diff --git a/application/views/request/course_found.xhtml b/application/views/request/course_found.xhtml index 51abbc96874986dc08fb6e4b1cbf3dd7542cfcb3..5f13122b637d212d0a91ad55f699fefc1e366d51 100644 --- a/application/views/request/course_found.xhtml +++ b/application/views/request/course_found.xhtml @@ -1,29 +1,38 @@ <h2> - The Course <?php echo $this->subject , ' ' + The course <?php echo $this->subject , ' ' , $this->courseNumber - , $this->courseLetter; ?> Already Exists. + , $this->courseLetter; ?> + <?php if(!$this->crosslisting) { ?> + currently exists. + <?php } else { ?> + currently exists as a crosslisting of + <?php echo trim($this->homeSubject . ' ' + . $this->homeCourseNumber . ' ' + . $this->homeCourseLetter) . '.'; ?> + <?php } ?> + <br /> You may: </h2> <ul> <li> <a href="/Request/Create/ChangeCourse/<?php echo $this->subject - . '/' . $this->courseNumber - . '/' . $this->courseLetter; ?>"> + . '/' . $this->courseNumber + . '/' . $this->courseLetter; ?>"> Request a <b>change</b> to this course </a> </li> <li> <a href="/Request/Create/AddISToCourse/<?php echo $this->subject - . '/' . $this->courseNumber - . '/' . $this->courseLetter; ?>"> + . '/' . $this->courseNumber + . '/' . $this->courseLetter; ?>"> Request <b>Integrated Studies</b> status for this course </a> </li> <li> <a href="/Request/Create/RemoveCourse/<?php echo $this->subject - . '/' . $this->courseNumber - . '/' . $this->courseLetter; ?>"> + . '/' . $this->courseNumber + . '/' . $this->courseLetter; ?>"> Request that this course be <b>removed</b> </a> </li>