Skip to content
Snippets Groups Projects
Commit 1bc66df4 authored by Tim Steiner's avatar Tim Steiner
Browse files

Next and Prev links will work after arring a Request View from Request Edit.

parent c1ef8c09
Branches
No related tags found
No related merge requests found
...@@ -5,7 +5,6 @@ class Courses_ViewController extends App_Controller_Action ...@@ -5,7 +5,6 @@ class Courses_ViewController extends App_Controller_Action
public function indexAction() public function indexAction()
{ {
$requestId = $this->getRequest()->getParam('id'); $requestId = $this->getRequest()->getParam('id');
$roleId = $this->getRequest()->getParam('role');
if ($requestId == 'session') { if ($requestId == 'session') {
$session = new Zend_Session_Namespace('Edit Request'); $session = new Zend_Session_Namespace('Edit Request');
$request = $session->request; $request = $session->request;
...@@ -29,9 +28,10 @@ class Courses_ViewController extends App_Controller_Action ...@@ -29,9 +28,10 @@ class Courses_ViewController extends App_Controller_Action
$preview = false; $preview = false;
// if we can know our role, we can create next and prev links. // if we can know our role, we can create next and prev links.
if ($roleId) {
$list = $this->getRequest()->getParam('list');
$myRequestSession = new Zend_Session_Namespace('My Requests'); $myRequestSession = new Zend_Session_Namespace('My Requests');
$roleId = $myRequestSession->lastRoleId;
$list = $myRequestSession->lastList;
if ($roleId) {
$requestOrder = $myRequestSession->requestOrder[$roleId][$list]; $requestOrder = $myRequestSession->requestOrder[$roleId][$list];
$listPosition = array_search($request->getId(), $requestOrder); $listPosition = array_search($request->getId(), $requestOrder);
if ($listPosition == 0) { if ($listPosition == 0) {
......
...@@ -5,6 +5,9 @@ class Requests_EditController extends App_Controller_Action ...@@ -5,6 +5,9 @@ class Requests_EditController extends App_Controller_Action
public function loadAction() public function loadAction()
{ {
$in = $this->getRequest()->getParams(); $in = $this->getRequest()->getParams();
$roleId = $in['role'];
$list = $in['list'];
if ($in['sessionId'] !== null) { if ($in['sessionId'] !== null) {
$id = $in['sessionId']; $id = $in['sessionId'];
$session = new Zend_Session_Namespace('Edit Request'); $session = new Zend_Session_Namespace('Edit Request');
...@@ -20,6 +23,14 @@ class Requests_EditController extends App_Controller_Action ...@@ -20,6 +23,14 @@ class Requests_EditController extends App_Controller_Action
$redirectUrl = '/' . $module . '/edit/load/id/' . $id; $redirectUrl = '/' . $module . '/edit/load/id/' . $id;
} }
$session = new Zend_Session_Namespace('My Requests');
if ($roleId) {
$session->lastRoleId = $roleId;
}
if ($list) {
$session->lastList = $list;
}
$this->_redirect($redirectUrl); $this->_redirect($redirectUrl);
} }
......
...@@ -10,6 +10,7 @@ class Requests_ViewController extends App_Controller_Action ...@@ -10,6 +10,7 @@ class Requests_ViewController extends App_Controller_Action
$roleId = $this->getRequest()->getParam('role'); $roleId = $this->getRequest()->getParam('role');
$list = $this->getRequest()->getParam('list'); $list = $this->getRequest()->getParam('list');
$session = new Zend_Session_Namespace('My Requests');
$request = Requests_RequestModel::find($id); $request = Requests_RequestModel::find($id);
$user = Auth_UserModel::findCurrentUser(); $user = Auth_UserModel::findCurrentUser();
...@@ -24,16 +25,17 @@ class Requests_ViewController extends App_Controller_Action ...@@ -24,16 +25,17 @@ class Requests_ViewController extends App_Controller_Action
$collection[] = $viewTime; $collection[] = $viewTime;
Requests_ViewTimeModel::save($viewTime); Requests_ViewTimeModel::save($viewTime);
$module = $request->getModule();
$redirectUrl = Zend_Controller_Action::getFrontController()->getBaseUrl()
. '/' . $module . '/view/index/id/' . $id;
if ($roleId) { if ($roleId) {
$redirectUrl .= '/role/' . $roleId; $session->lastRoleId = $roleId;
} }
if ($list) { if ($list) {
$redirectUrl .= '/list/' . $list; $session->lastList = $list;
} }
$module = $request->getModule();
$redirectUrl = Zend_Controller_Action::getFrontController()->getBaseUrl()
. '/' . $module . '/view/index/id/' . $id;
$this->getResponse()->setRedirect($redirectUrl); $this->getResponse()->setRedirect($redirectUrl);
} }
......
...@@ -328,7 +328,7 @@ foreach($this->roles as $roleData) { ...@@ -328,7 +328,7 @@ foreach($this->roles as $roleData) {
<?php if ($request->isEditable()) { ?> <?php if ($request->isEditable()) { ?>
/ /
<a class="requestLink<?php echo $linkClass; ?>" <a class="requestLink<?php echo $linkClass; ?>"
href="<?php echo $this->baseUrl(); ?>/requests/edit/load/id/<?php echo $request->getId(); ?>"> href="<?php echo $this->baseUrl(); ?>/requests/edit/load/id/<?php echo $request->getId(); ?>/role/<?php echo $role->getId(); ?>/list/normal">
Edit Edit
</a> </a>
<?php } ?> <?php } ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment