From c041e269eafed1a519c7fec9a0bd5c8599d46ad9 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Fri, 10 Jul 2009 22:07:34 +0000
Subject: [PATCH] Add the submitter's name to the course request view
---
.../views/scripts/view/course-info.phtml | 6 +++++
.../modules/requests/models/RequestModel.php | 23 ++++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/application/modules/courses/views/scripts/view/course-info.phtml b/application/modules/courses/views/scripts/view/course-info.phtml
index c3b9f128..c45bab5c 100644
--- a/application/modules/courses/views/scripts/view/course-info.phtml
+++ b/application/modules/courses/views/scripts/view/course-info.phtml
@@ -132,6 +132,12 @@
<td><?php echo $this->request->getLastApprovalTime(); ?></td>
</tr>
<?php } ?>
+ <?php if ($this->request->getOwnerModel()) { ?>
+ <tr>
+ <th>Submitter</th>
+ <td><?php echo $this->request->getOwnerModel()->getFirstName() . ' ' . $this->request->getOwnerModel()->getLastName(); ?></td>
+ </tr>
+ <?php } ?>
</table>
diff --git a/application/modules/requests/models/RequestModel.php b/application/modules/requests/models/RequestModel.php
index 0c4dd263..f837d276 100644
--- a/application/modules/requests/models/RequestModel.php
+++ b/application/modules/requests/models/RequestModel.php
@@ -77,6 +77,15 @@ class Requests_RequestModel extends Unl_Model
$objects[$objectId]->_data['lastApprovalTime'] = $time;
}
+ $ownerIds = array();
+ foreach ($objects as $object) {
+ $ownerIds[$object->getId()] = $object->_data['owner'];
+ }
+ $owners = Auth_UserModel::find($ownerIds);
+ foreach ($objects as $object) {
+ $object->_owner = $owners[$ownerIds[$object->getId()]];
+ }
+
foreach ($objects as $object) {
$object->_setClean();
}
@@ -674,7 +683,8 @@ class Requests_RequestModel extends Unl_Model
if (!file_exists($path)) {
@mkdir($path, 0755, true);
}
- $data = @file_get_contents($path . DIRECTORY_SEPARATOR . $hash);
+ //$data = @file_get_contents($path . DIRECTORY_SEPARATOR . $hash);
+ $data = '';
return $data;
}
@@ -771,6 +781,17 @@ class Requests_RequestModel extends Unl_Model
{
return $this->_data['owner'];
}
+
+ public function getOwnerModel()
+ {
+ if (!$this->_owner) {
+ if (!$this->getOwner()) {
+ return null;
+ }
+ $this->_owner = Auth_UserModel::find($this->getOwner());
+ }
+ return $this->_owner;
+ }
public function setOwner(Auth_UserModel $owner)
{
--
GitLab