Add DF Removal, sidebar links in Edit Request now submit the form, 403 Error...

Add DF Removal, sidebar links in Edit Request now submit the form, 403 Error page for RequestController

application/controllers/RequestController.php

@@ -5,7 +5,7 @@ class RequestController extends Nmc_Controller_Action
 
     public function init()
     {
-        $this->_registerPlugin(new Nmc_Controller_Action_Plugin_Authorize());
+        $this->_registerPlugin(new Application_Controller_Action_Plugin_Authorize());
     }
 
     public function indexAction()
@@ -99,13 +99,18 @@ class RequestController extends Nmc_Controller_Action
 
     public function loadAction()
     {
-        $in = $this->_getAllParams();
+        $in = $this->getRequest();
+        $requestId = $in->getParam(0);
 
-        $requestId = Zend_Filter_Int::filter($in[0]);
+        if ($requestId == 'saved') {
+            $course = Nmc_Registry_Session::getInstance()->savedCourse;
+            $request = Nmc_Registry_Session::getInstance()->savedRequest;
+        } else {
+            $requestId = Zend_Filter_Int::filter($requestId);
             $request = Requests::getInstance()->findOne($requestId);
             $course = $request->getCourseGeneration();
-
             $course = clone $course;
+        }
 
         Nmc_Registry_Session::getInstance()->course = $course;
         Nmc_Registry_Session::getInstance()->request = $request;
@@ -189,7 +194,7 @@ class RequestController extends Nmc_Controller_Action
 
 
 
-        $submit = Zend_Filter_Alpha::filter($_POST['submit']);
+        $submit = Zend_Filter_Alpha::filter($_POST['submitType']);
 
         if(is_array($_POST['request'])) {
         foreach($_POST['request'] as $key => $val) {
@@ -207,7 +212,7 @@ class RequestController extends Nmc_Controller_Action
 
         unset($_POST['request']);
 
-        unset($_POST['submit']);
+        unset($_POST['submitType']);
         unset($_POST['p_subject']);
         unset($_POST['p_course_number']);
 
@@ -417,7 +422,7 @@ class RequestController extends Nmc_Controller_Action
         if($submit == 'Submit') {
             return $this->_submitRequestAction();
         } else if ($submit == 'SaveforLaterSubmission') {
-            // save for later
+            return $this->_saveUnfinishedRequest();
         } else if ($submit == 'CancelRequest') {
             return $this->_cancelRequest();
         }
@@ -452,7 +457,9 @@ class RequestController extends Nmc_Controller_Action
             $prevForm = $requestFormOrder[$currentForm];
         }
 
-        if($submit == 'Prev') {
+        if (in_array($submit, $requestFormOrder)) {
+            $targetForm = $submit;
+        } else if($submit == 'Prev') {
             $targetForm = $prevForm;
         } else {
             $targetForm = $nextForm;
@@ -690,6 +697,23 @@ class RequestController extends Nmc_Controller_Action
         $view->refresh = '/home';
         echo $view->render('unlModernWrapper.xhtml');
     }
+
+    protected function _saveUnfinishedRequest()
+    {
+        $user = Nmc_User::getInstance()->getUser();
+        $course = Nmc_Registry_Session::getInstance()->course;
+        $request = Nmc_Registry_Session::getInstance()->request;
+
+        Nmc_Registry_Session::getInstance()->savedCourse = $course;
+        Nmc_Registry_Session::getInstance()->savedRequest = $request;
+
+        Nmc_Registry_Session::getInstance()->erase('course');
+        Nmc_Registry_Session::getInstance()->erase('request');
+
+        $view = new Application_View();
+        $view->refresh = '/home';
+        echo $view->render('unlModernWrapper.xhtml');
+    }
 }
 
 ?>

application/views/request/edit_wrapper.xhtml

-<form action="/Request/update" method="post" enctype="multipart/form-data">
+<form id="editRequestForm" action="/Request/update" method="post" enctype="multipart/form-data">
     <?php @include('' . $this->requestPage . '.xhtml'); ?>
-    <input id="prev_button" type="submit" name="submit" value="&lt; Prev" />
-    <input id="next_button" type="submit" name="submit" value="Next &gt;" />
+    <input id="prev_button" type="submit" name="submitType" value="&lt; Prev" />
+    <input id="next_button" type="submit" name="submitType" value="Next &gt;" />
 </form>

application/views/request/submit.xhtml

@@ -10,6 +10,6 @@
     to finish your request.
 </h2>
 
-<input id="submit_request" type="submit" name="submit" value="Submit" />
-<input id="save_request" type="submit" name="submit" value="Save for Later Submission" />
-<input id="cancel_request" type="submit" name="submit" value="Cancel Request" />
+<input id="submit_request" type="submit" name="submitType" value="Submit" />
+<input id="save_request" type="submit" name="submitType" value="Save for Later Submission" />
+<input id="cancel_request" type="submit" name="submitType" value="Cancel Request" />
\ No newline at end of file

application/views/request/time_location.xhtml

@@ -36,6 +36,33 @@
     </label>
 </fieldset>
 
+<h2>DF Removal</h2>
+<fieldset class="three_column">
+    <label>
+        No
+        <input type="radio"
+               class="radio"
+               name="dfRemoval"
+               value="no"
+               <?php if($this->course->dfRemoval == 'no') { ?>
+               checked="checked"
+               <?php } ?>
+               />
+    </label>
+
+    <label>
+        Yes
+        <input type="radio"
+               class="radio"
+               name="dfRemoval"
+               value="yes"
+               <?php if($this->course->dfRemoval == 'yes') { ?>
+               checked="checked"
+               <?php } ?>
+               />
+    </label>
+</fieldset>
+
 <h2>Delivery Method(s)</h2>
 <fieldset class="three_column">
     <label>

application/views/sidebars/requestProgress.xhtml

@@ -9,7 +9,7 @@
     <div class="content">
         <ul>
             <li class="completed">
-                 <a href="/Request/courseID">Course ID</a>
+                 <a href="/Request/CourseID">Course ID</a>
             </li>
             <li>
                  <a href="/Request/CreditHours">Credit Hours</a>

document_root/javascript/request/edit_wrapper.js

@@ -12,6 +12,12 @@ function onEditWrapperLoad()
     for(var i = 0; i < removeButtons.length; i++) {
         removeButtons[i].onclick = handleRemoveRecord;
     }
+
+    var requestProgress = document.getElementById('requestProgress');
+    var requestProgressLinks = requestProgress.getElementsByTagName('a');
+    for (var i = 0; i < requestProgressLinks.length; i++) {
+        requestProgressLinks[i]. onclick = handleRequestProgressLinkClicked;
+    }
 }
 
 function handleAddRecord()
@@ -71,5 +77,20 @@ function handleRemoveRecord()
 
     currentTable.removeChild(currentTR);
 
+    return false;
+}
+
+function handleRequestProgressLinkClicked()
+{
+    var editRequestForm = document.getElementById('editRequestForm');
+    var submitType = document.createElement('input');
+    submitType.type = 'hidden';
+    submitType.name = 'submitType';
+    submitType.value = this.href.split('/').pop();
+    editRequestForm.appendChild(submitType);
+    editRequestForm.submit( );
+
+
+
     return false;
 }