From 4bc6be97cda91b384e4e0f9c131b1de200cf44ce Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Thu, 17 Jan 2008 22:54:00 +0000
Subject: [PATCH] Don't complain if a new request is made for a course that has
previously been removed
---
application/controllers/RequestController.php | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/application/controllers/RequestController.php b/application/controllers/RequestController.php
index 90278840..8999bfef 100755
--- a/application/controllers/RequestController.php
+++ b/application/controllers/RequestController.php
@@ -51,18 +51,20 @@ class RequestController extends Nmc_Controller_Action
$out->courseNumber = $courseNumber;
$out->courseLetter = $courseLetter;
- if(!$course) {
+
+ if ($course) {
+ $parentCourse = $course->getParentCourse();
+ $course = clone $parentCourse;
+ }
+
+ if(!$course || $course->removed == 'yes') {
// course not found
- $out->page = 'request/create_new_course_ask';
Nmc_Registry_Session::getInstance()->erase('course');
+ $out->page = 'request/create_new_course_ask';
} 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 ||
--
GitLab