Skip to content
Snippets Groups Projects
Commit 16308e95 authored by Roger W Feese's avatar Roger W Feese
Browse files

Allow new course requests, we only want to restrict bulletin requests for now.

parent e8379aea
No related branches found
No related tags found
1 merge request!31Disable new requests
...@@ -4,14 +4,6 @@ class Courses_NewController extends Creq_Controller_Action ...@@ -4,14 +4,6 @@ class Courses_NewController extends Creq_Controller_Action
{ {
public function indexAction() 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'; . '/courses/new/search';
$this->getResponse()->setRedirect($redirectUrl); $this->getResponse()->setRedirect($redirectUrl);
...@@ -19,34 +11,19 @@ class Courses_NewController extends Creq_Controller_Action ...@@ -19,34 +11,19 @@ class Courses_NewController extends Creq_Controller_Action
public function searchAction() 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( $filter = array(
'subject' => array('Alpha', 'StringToUpper'), 'subject' => array('Alpha', 'StringToUpper'),
'courseNumber' => array('Digits'), 'courseNumber' => array('Digits'),
'courseLetter' => array('Alpha', 'StringToUpper'), 'courseLetter' => array('Alpha', 'StringToUpper')
'id' => array('Digits')
); );
$in = new Zend_Filter_Input($filter, array(), $this->getRequest()->getParams()); $in = new Zend_Filter_Input($filter, array(), $this->getRequest()->getParams());
//if (!$in->id || (!$in->subject || !$in->courseNumber)) {
if (!$in->subject || !$in->courseNumber) { if (!$in->subject || !$in->courseNumber) {
return; return;
} }
if($in->id){
$course = Courses_CourseModel::find($in->id);
}
else{
$course = Courses_CourseModel::findByCourseCode($in->subject, $in->courseNumber, $in->courseLetter); $course = Courses_CourseModel::findByCourseCode($in->subject, $in->courseNumber, $in->courseLetter);
} $activeRequests = Courses_CourseModel::findActiveRequestByCourseCode($in->subject, $in->courseNumber, $in->courseLetter);
$activeRequests = Courses_CourseModel::findActiveRequestByCourseCode($course->getSubject(), $course->getCourseNumber(), $course->getCourseLetter());
if (count($activeRequests) > 0) { if (count($activeRequests) > 0) {
$render = 'conflict'; $render = 'conflict';
} else if ($course) { } else if ($course) {
...@@ -71,9 +48,9 @@ class Courses_NewController extends Creq_Controller_Action ...@@ -71,9 +48,9 @@ class Courses_NewController extends Creq_Controller_Action
$this->view->isAdmin = true; $this->view->isAdmin = true;
} }
$this->view->subject = $course->getSubject(); $this->view->subject = $in->subject;
$this->view->courseLetter = $course->getCourseLetter(); $this->view->courseLetter = $in->courseLetter;
$this->view->courseNumber = $course->getCourseNumber; $this->view->courseNumber = $in->courseNumber;
$this->view->activeRequests = $activeRequests; $this->view->activeRequests = $activeRequests;
if ($course instanceof Courses_CourseModel) { if ($course instanceof Courses_CourseModel) {
$this->view->isAce = $course->isAce(); $this->view->isAce = $course->isAce();
...@@ -81,13 +58,10 @@ class Courses_NewController extends Creq_Controller_Action ...@@ -81,13 +58,10 @@ class Courses_NewController extends Creq_Controller_Action
$this->view->isGrad = $course->isGraduateLevel(); $this->view->isGrad = $course->isGraduateLevel();
} }
$this->render($render); $this->render($render);
*/
} }
public function searchPostAction() public function searchPostAction()
{ {
$this->redirect('/courses/new');
$filter = array( $filter = array(
'subject' => array('Alpha', 'StringToUpper'), 'subject' => array('Alpha', 'StringToUpper'),
'courseNumber' => array('Digits'), 'courseNumber' => array('Digits'),
...@@ -111,8 +85,6 @@ class Courses_NewController extends Creq_Controller_Action ...@@ -111,8 +85,6 @@ class Courses_NewController extends Creq_Controller_Action
public function createAction() public function createAction()
{ {
$this->redirect('/courses/new');
$filter = array( $filter = array(
'type' => array('StringTrim'), 'type' => array('StringTrim'),
'subject' => array('Alpha', 'StringToUpper'), 'subject' => array('Alpha', 'StringToUpper'),
......
<?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/courses/new.css', 'all'); ?> <?php $this->headLink()->appendStylesheet($this->baseUrl() . '/css/courses/new.css', 'all'); ?>
<?php $this->headScript()->appendFile($this->baseUrl() . '/javascript/courses/new.js'); ?> <?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="helpLinkBox"><a href="<?php echo $this->baseUrl(); ?>/courses/edit/help" target="helpWindow">Curriculum Policies</a></div>
<div id="announcements" class="titled_box"> <div id="announcements" class="titled_box">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment