AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug with notifications and subtask restriction

Browse Source
This commit is contained in:
Frederic Guillot
2015-04-06 18:41:51 -04:00
parent b89a4ac33f
commit 13ea77f018
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Subscriber/NotificationSubscriber.php
View File

@@ -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']);