From 89243917c39cc8c149adc046540b908acfb444b5 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Mon, 29 Jun 2009 14:52:00 +0000
Subject: [PATCH] On the view request screen, when a user can make a decision,
show the role(s) that is making the decision.
---
application/modules/courses/controllers/ViewController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/modules/courses/controllers/ViewController.php b/application/modules/courses/controllers/ViewController.php
index e53d07a1..aaa53c77 100644
--- a/application/modules/courses/controllers/ViewController.php
+++ b/application/modules/courses/controllers/ViewController.php
@@ -61,7 +61,7 @@ class Courses_ViewController extends App_Controller_Action
$userRoles = Requests_ApprovalRoleModel::findByUser($user);
- $allowedRoles = array_intersect(array(1) + $possibleAction->getParticipatingRoleIds(), $userRoles->getId());
+ $allowedRoles = array_intersect(array_merge(array(1), $possibleAction->getParticipatingRoleIds()), $userRoles->getId());
if (count($allowedRoles) > 0) {
$action = $possibleAction;
foreach ($allowedRoles as $allowedRole) {
--
GitLab