From 16308e95d3a94702cbb7febb2d2c8c4c06367538 Mon Sep 17 00:00:00 2001
From: Roger Feese <rfeese@unl.edu>
Date: Tue, 11 Apr 2017 10:23:21 -0500
Subject: [PATCH] Allow new course requests, we only want to restrict bulletin
requests for now.
---
.../courses/controllers/NewController.php | 48 ++++---------------
.../courses/views/scripts/new/search.phtml | 17 -------
2 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/application/modules/courses/controllers/NewController.php b/application/modules/courses/controllers/NewController.php
index cadee705..4baeeb38 100644
--- a/application/modules/courses/controllers/NewController.php
+++ b/application/modules/courses/controllers/NewController.php
@@ -3,50 +3,27 @@
class Courses_NewController extends Creq_Controller_Action
{
public function indexAction()
- {
-
- //disable new requests
- $this->_helper->getHelper('FlashMessenger')->addMessage(
- "If you would like to submit a change please contact your college catalog editor or Nicolette Brenton at 402-472-4030 or brenton@unl.edu."
- );
-
- $this->view->messages = $this->_helper->getHelper('FlashMessenger')->getMessages();
-
- $redirectUrl = Zend_Controller_Front::getInstance()->getBaseUrl()
+ {
+ $redirectUrl = Zend_Controller_Front::getInstance()->getBaseUrl()
. '/courses/new/search';
- $this->getResponse()->setRedirect($redirectUrl);
+ $this->getResponse()->setRedirect($redirectUrl);
}
public function searchAction()
- {
- //disable new requests
- $this->_helper->getHelper('FlashMessenger')->addMessage(
- "If you would like to submit a change please contact your college catalog editor or Nicolette Brenton at 402-472-4030 or brenton@unl.edu."
- );
-
- $this->view->messages = $this->_helper->getHelper('FlashMessenger')->getMessages();
-
- /*
+ {
$filter = array(
'subject' => array('Alpha', 'StringToUpper'),
'courseNumber' => array('Digits'),
- 'courseLetter' => array('Alpha', 'StringToUpper'),
- 'id' => array('Digits')
+ 'courseLetter' => array('Alpha', 'StringToUpper')
);
$in = new Zend_Filter_Input($filter, array(), $this->getRequest()->getParams());
- //if (!$in->id || (!$in->subject || !$in->courseNumber)) {
if (!$in->subject || !$in->courseNumber) {
return;
}
- if($in->id){
- $course = Courses_CourseModel::find($in->id);
- }
- else{
- $course = Courses_CourseModel::findByCourseCode($in->subject, $in->courseNumber, $in->courseLetter);
- }
- $activeRequests = Courses_CourseModel::findActiveRequestByCourseCode($course->getSubject(), $course->getCourseNumber(), $course->getCourseLetter());
+ $course = Courses_CourseModel::findByCourseCode($in->subject, $in->courseNumber, $in->courseLetter);
+ $activeRequests = Courses_CourseModel::findActiveRequestByCourseCode($in->subject, $in->courseNumber, $in->courseLetter);
if (count($activeRequests) > 0) {
$render = 'conflict';
} else if ($course) {
@@ -71,9 +48,9 @@ class Courses_NewController extends Creq_Controller_Action
$this->view->isAdmin = true;
}
- $this->view->subject = $course->getSubject();
- $this->view->courseLetter = $course->getCourseLetter();
- $this->view->courseNumber = $course->getCourseNumber;
+ $this->view->subject = $in->subject;
+ $this->view->courseLetter = $in->courseLetter;
+ $this->view->courseNumber = $in->courseNumber;
$this->view->activeRequests = $activeRequests;
if ($course instanceof Courses_CourseModel) {
$this->view->isAce = $course->isAce();
@@ -81,13 +58,10 @@ class Courses_NewController extends Creq_Controller_Action
$this->view->isGrad = $course->isGraduateLevel();
}
$this->render($render);
- */
}
public function searchPostAction()
{
- $this->redirect('/courses/new');
-
$filter = array(
'subject' => array('Alpha', 'StringToUpper'),
'courseNumber' => array('Digits'),
@@ -111,8 +85,6 @@ class Courses_NewController extends Creq_Controller_Action
public function createAction()
{
- $this->redirect('/courses/new');
-
$filter = array(
'type' => array('StringTrim'),
'subject' => array('Alpha', 'StringToUpper'),
diff --git a/application/modules/courses/views/scripts/new/search.phtml b/application/modules/courses/views/scripts/new/search.phtml
index 103be818..4dc1819c 100644
--- a/application/modules/courses/views/scripts/new/search.phtml
+++ b/application/modules/courses/views/scripts/new/search.phtml
@@ -1,23 +1,6 @@
<?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/courses/new.css', 'all'); ?>
<?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/courses/new.js'); ?>
-<?php if ($this->messages) { ?>
- <script type="text/javascript">
- WDN.initializePlugin('notice');
- </script>
- <div class="wdn_notice">
- <div class="close">
- <a href="#" title="Close this notice">Close this notice</a>
- </div>
- <div class="message">
- <?php foreach ($this->messages as $message) {
- echo $message;
- }?>
- </div>
- </div>
-<?php } ?>
-
-
<div id="helpLinkBox"><a href="<?php echo $this->baseUrl(); ?>/courses/edit/help" target="helpWindow">Curriculum Policies</a></div>
<div id="announcements" class="titled_box">
--
GitLab