From 90c28602c31d88f576f3d676c31d439ad3e58e68 Mon Sep 17 00:00:00 2001 From: Cristian Bell Date: Thu, 15 Sep 2016 14:38:55 +0200 Subject: [PATCH] chg: creator e-mail in the event details, fixes #1252 (#1535) * chg: creator e-mail in the event details, fixes #1252 --- app/Controller/EventsController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php index faf3a5740..268092b41 100644 --- a/app/Controller/EventsController.php +++ b/app/Controller/EventsController.php @@ -857,6 +857,10 @@ class EventsController extends AppController { } $results = $this->Event->fetchEvent($this->Auth->user(), $conditions); if (empty($results)) throw new NotFoundException('Invalid event'); + //if the current user is an org admin AND event belongs to his/her org, fetch also the event creator info + if ($this->userRole['perm_admin'] && !$this->_isSiteAdmin() && ($results[0]['Org']['id'] == $this->Auth->user('org_id'))) { + $results[0]['User']['email'] = $this->User->field('email', array('id' , $results[0]['Event']['user_id'])); + } $event = &$results[0]; if ($this->_isRest()) { $this->set('event', $event);