From 55970a4b2040683d14a7a522ef70fb3b3fabfdbd Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 6 Feb 2013 14:32:13 -0500 Subject: [PATCH] CC-4925: Changing User permissions to a higher level ends up with show editing problems - added check to ensure user is not an admin before assigning the 'dj-edit-show' action --- airtime_mvc/application/controllers/ScheduleController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 1f3216eed..20214f093 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -573,7 +573,10 @@ class ScheduleController extends Zend_Controller_Action return; } - if ($isDJ) { + // in case a user was once a dj and had been assigned to a show + // but was then changed to an admin user we need to allow + // the user to edit the show as an admin (CC-4925) + if ($isDJ && !$idAdminOrPM) { $this->view->action = "dj-edit-show"; }