From af767bfb791044384a925d2fb963692e8cff5ac1 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 16 Jul 2008 20:21:51 +0000
Subject: [PATCH] Edit links on the View Request screen if the user has the
ability to.
---
application/modules/courses/controllers/ViewController.php | 6 +++++-
application/modules/courses/views/scripts/view/index.phtml | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/application/modules/courses/controllers/ViewController.php b/application/modules/courses/controllers/ViewController.php
index ede34809..1821c926 100644
--- a/application/modules/courses/controllers/ViewController.php
+++ b/application/modules/courses/controllers/ViewController.php
@@ -17,6 +17,7 @@ class Courses_ViewController extends App_Controller_Action
$initialRequest = true;
}
$preview = true;
+ $canEdit = false;
} else {
$request = Requests_RequestModel::find($requestId);
$course = Courses_CourseModel::findLatestOfRequest($request);
@@ -45,6 +46,7 @@ class Courses_ViewController extends App_Controller_Action
$nextRequestId = $requestOrder[$listPosition + 1];
}
}
+ $canEdit = in_array($request->getId(), $myRequestSession->editableRequests);
}
$comments = Requests_CommentsModel::findByRequest($request);
@@ -61,7 +63,9 @@ class Courses_ViewController extends App_Controller_Action
$this->view->isRequestValid = $course->isValid() && $request->isValid();
$this->view->prevRequestId = $prevRequestId;
$this->view->nextRequestId = $nextRequestId;
- $this->view->canEdit = in_array($request->getId(), $myRequestSession->editableRequests);
+ $this->view->canEdit = $canEdit;
+ $this->view->lastList = $list;
+ $this->view->lastRoleId = $roleId;
$session = new Zend_Session_Namespace(__CLASS__);
if ($session->tabName) {
diff --git a/application/modules/courses/views/scripts/view/index.phtml b/application/modules/courses/views/scripts/view/index.phtml
index a7028077..a422f5ce 100644
--- a/application/modules/courses/views/scripts/view/index.phtml
+++ b/application/modules/courses/views/scripts/view/index.phtml
@@ -292,7 +292,7 @@
<?php if($this->canEdit) { ?>
<div id="editLink">
- <a href="/Request/Load/<?php echo $this->request->getId(); ?>">-Edit-</a>
+ <a href="<?php echo $this->baseUrl(); ?>/requests/edit/load/id/<?php echo $this->request->getId(); ?>/role/<?php echo $this->lastRoleId; ?>/list/<?php echo $this->lastList; ?>">-Edit-</a>
</div>
<?php } ?>
--
GitLab