From e8379aea18f805ad91111d127d3f3a4bb65eece7 Mon Sep 17 00:00:00 2001
From: Roger Feese <rfeese@unl.edu>
Date: Tue, 11 Apr 2017 10:05:01 -0500
Subject: [PATCH] Disable new requests per Nicolette. New requests will go to
the Courseleaf system.
---
.../bulletin/controllers/NewController.php | 8 ++++
.../courses/controllers/NewController.php | 48 +++++++++++++++----
.../courses/views/scripts/new/search.phtml | 17 +++++++
.../controllers/NewController.php | 7 +++
.../controllers/NewController.php | 7 +++
5 files changed, 77 insertions(+), 10 deletions(-)
diff --git a/application/modules/bulletin/controllers/NewController.php b/application/modules/bulletin/controllers/NewController.php
index 5adc6c35..4ad8ba95 100644
--- a/application/modules/bulletin/controllers/NewController.php
+++ b/application/modules/bulletin/controllers/NewController.php
@@ -4,6 +4,11 @@ class Bulletin_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();
$colleges = array();
@@ -19,6 +24,9 @@ class Bulletin_NewController extends Creq_Controller_Action
public function createAction()
{
+
+ $this->redirect('/bulletin/new');
+
$in = $this->getAllParams();
if ($in['college'] == '_null') {
$in['college'] = NULL;
diff --git a/application/modules/courses/controllers/NewController.php b/application/modules/courses/controllers/NewController.php
index 4baeeb38..cadee705 100644
--- a/application/modules/courses/controllers/NewController.php
+++ b/application/modules/courses/controllers/NewController.php
@@ -3,27 +3,50 @@
class Courses_NewController extends Creq_Controller_Action
{
public function indexAction()
- {
- $redirectUrl = Zend_Controller_Front::getInstance()->getBaseUrl()
+ {
+
+ //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()
. '/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')
+ 'courseLetter' => array('Alpha', 'StringToUpper'),
+ 'id' => array('Digits')
);
$in = new Zend_Filter_Input($filter, array(), $this->getRequest()->getParams());
+ //if (!$in->id || (!$in->subject || !$in->courseNumber)) {
if (!$in->subject || !$in->courseNumber) {
return;
}
- $course = Courses_CourseModel::findByCourseCode($in->subject, $in->courseNumber, $in->courseLetter);
- $activeRequests = Courses_CourseModel::findActiveRequestByCourseCode($in->subject, $in->courseNumber, $in->courseLetter);
+ 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());
if (count($activeRequests) > 0) {
$render = 'conflict';
} else if ($course) {
@@ -48,9 +71,9 @@ class Courses_NewController extends Creq_Controller_Action
$this->view->isAdmin = true;
}
- $this->view->subject = $in->subject;
- $this->view->courseLetter = $in->courseLetter;
- $this->view->courseNumber = $in->courseNumber;
+ $this->view->subject = $course->getSubject();
+ $this->view->courseLetter = $course->getCourseLetter();
+ $this->view->courseNumber = $course->getCourseNumber;
$this->view->activeRequests = $activeRequests;
if ($course instanceof Courses_CourseModel) {
$this->view->isAce = $course->isAce();
@@ -58,10 +81,13 @@ 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'),
@@ -85,6 +111,8 @@ 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 4dc1819c..103be818 100644
--- a/application/modules/courses/views/scripts/new/search.phtml
+++ b/application/modules/courses/views/scripts/new/search.phtml
@@ -1,6 +1,23 @@
<?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">
diff --git a/application/modules/fouryearplans/controllers/NewController.php b/application/modules/fouryearplans/controllers/NewController.php
index 27504980..b887bf34 100644
--- a/application/modules/fouryearplans/controllers/NewController.php
+++ b/application/modules/fouryearplans/controllers/NewController.php
@@ -18,6 +18,13 @@ class FourYearPlans_NewController extends Creq_Controller_Action
public function createAction()
{
+ //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->redirect('/fouryearplans/new');
+
+
$in = $this->getAllParams();
$activeRequests = FourYearPlans_FourYearPlanModel::findActiveRequestByMajorId($in['major']);
diff --git a/application/modules/learningoutcomes/controllers/NewController.php b/application/modules/learningoutcomes/controllers/NewController.php
index b72ebf6b..acbb51b8 100644
--- a/application/modules/learningoutcomes/controllers/NewController.php
+++ b/application/modules/learningoutcomes/controllers/NewController.php
@@ -4,12 +4,19 @@ class LearningOutcomes_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();
$this->view->majors = Bulletin_UtilityModel::getMajors();
}
public function createAction()
{
+ $this->redirect('/learningoutcomes/new');
+
$in = $this->getAllParams();
$activeRequests = LearningOutcomes_LearningOutcomeModel::findActiveRequestByMajorId($in['major']);
--
GitLab