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

Fix a bug where people who had completed requests under "My submissions" would get a fatal error.

parent 56222e36
No related branches found
Tags
No related merge requests found
......@@ -132,14 +132,16 @@
$action = $requestData['action'];
$comments = $requestData['comments'];
$viewTime = $requestData['viewTime'];
$decisions = array('_null' => '--Decision--') + $action->getResultStatusStrings($request, $this->user);
$vote = '_null';
if ($requestData['vote']) {
if ($requestData['vote']->getApprovalAction() == $action->getId()) {
$vote = $requestData['vote']->getVote();
} else {
$decisions['_null'] = 'PREVOTE: ' . $requestData['vote']->getVote();
}
if ($request->isSubmitterAttentionRequired()) {
$decisions = array('_null' => '--Decision--') + $action->getResultStatusStrings($request, $this->user);
$vote = '_null';
if ($requestData['vote']) {
if ($requestData['vote']->getApprovalAction() == $action->getId()) {
$vote = $requestData['vote']->getVote();
} else {
$decisions['_null'] = 'PREVOTE: ' . $requestData['vote']->getVote();
}
}
}
?>
<tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>>
......@@ -149,7 +151,7 @@
</td>
<td><?php echo htmlentities($originalCourse->getCollege(), NULL, 'UTF-8'); ?></td>
<td><?php echo htmlentities($request->getType(), NULL, 'UTF-8'); ?></td>
<td><?php echo htmlentities($action->getCurrentApprovalBody(), NULL, 'UTF-8'); ?></td>
<td><?php if($action) { echo htmlentities($action->getCurrentApprovalBody(), NULL, 'UTF-8'); } ?></td>
<td>
<?php
if ($request->isSubmitterAttentionRequired()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment