From 13ea77f018cebbf0a3b0457d4806cd6b8b5614e1 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Mon, 6 Apr 2015 18:41:51 -0400 Subject: Fix bug with notifications and subtask restriction --- app/Subscriber/NotificationSubscriber.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'app/Subscriber/NotificationSubscriber.php') diff --git a/app/Subscriber/NotificationSubscriber.php b/app/Subscriber/NotificationSubscriber.php index 94815b56..09ca7625 100644 --- a/app/Subscriber/NotificationSubscriber.php +++ b/app/Subscriber/NotificationSubscriber.php @@ -47,10 +47,13 @@ class NotificationSubscriber extends Base implements EventSubscriberInterface public function execute(GenericEvent $event, $event_name) { $values = $this->getTemplateData($event); - $users = $this->notification->getUsersList($values['task']['project_id']); - if (! empty($users)) { - $this->notification->sendEmails($this->templates[$event_name], $users, $values); + if (isset($values['task']['project_id'])) { + $users = $this->notification->getUsersList($values['task']['project_id']); + + if (! empty($users)) { + $this->notification->sendEmails($this->templates[$event_name], $users, $values); + } } } @@ -64,11 +67,11 @@ class NotificationSubscriber extends Base implements EventSubscriberInterface break; case 'Event\SubtaskEvent': $values['subtask'] = $this->subtask->getById($event['id'], true); - $values['task'] = $this->taskFinder->getDetails($event['task_id']); + $values['task'] = $this->taskFinder->getDetails($values['subtask']['task_id']); break; case 'Event\FileEvent': $values['file'] = $event->getAll(); - $values['task'] = $this->taskFinder->getDetails($event['task_id']); + $values['task'] = $this->taskFinder->getDetails($values['file']['task_id']); break; case 'Event\CommentEvent': $values['comment'] = $this->comment->getById($event['id']); -- cgit v1.2.3