@@ -26,7 +26,7 @@ namespace OCA\Deck\Notification;
|
||||
use DateTime;
|
||||
use OCA\Deck\AppInfo\Application;
|
||||
use OCA\Deck\Db\Acl;
|
||||
use OCA\Deck\Db\AssignedUsersMapper;
|
||||
use OCA\Deck\Db\AssignmentMapper;
|
||||
use OCA\Deck\Db\Board;
|
||||
use OCA\Deck\Db\BoardMapper;
|
||||
use OCA\Deck\Db\CardMapper;
|
||||
@@ -44,8 +44,8 @@ class NotificationHelper {
|
||||
protected $cardMapper;
|
||||
/** @var BoardMapper */
|
||||
protected $boardMapper;
|
||||
/** @var AssignedUsersMapper */
|
||||
protected $assignedUsersMapper;
|
||||
/** @var AssignmentMapper */
|
||||
protected $assignmentMapper;
|
||||
/** @var PermissionService */
|
||||
protected $permissionService;
|
||||
/** @var IConfig */
|
||||
@@ -62,7 +62,7 @@ class NotificationHelper {
|
||||
public function __construct(
|
||||
CardMapper $cardMapper,
|
||||
BoardMapper $boardMapper,
|
||||
AssignedUsersMapper $assignedUsersMapper,
|
||||
AssignmentMapper $assignmentMapper,
|
||||
PermissionService $permissionService,
|
||||
IConfig $config,
|
||||
IManager $notificationManager,
|
||||
@@ -71,7 +71,7 @@ class NotificationHelper {
|
||||
) {
|
||||
$this->cardMapper = $cardMapper;
|
||||
$this->boardMapper = $boardMapper;
|
||||
$this->assignedUsersMapper = $assignedUsersMapper;
|
||||
$this->assignmentMapper = $assignmentMapper;
|
||||
$this->permissionService = $permissionService;
|
||||
$this->config = $config;
|
||||
$this->notificationManager = $notificationManager;
|
||||
@@ -107,7 +107,7 @@ class NotificationHelper {
|
||||
if ($user->getUID() === $board->getOwner() && count($board->getAcl()) === 0) {
|
||||
// Notify if all or assigned is configured for unshared boards
|
||||
$shouldNotify = true;
|
||||
} elseif ($notificationSetting === ConfigService::SETTING_BOARD_NOTIFICATION_DUE_ASSIGNED && $this->assignedUsersMapper->isUserAssigned($card->getId(), $user->getUID())) {
|
||||
} elseif ($notificationSetting === ConfigService::SETTING_BOARD_NOTIFICATION_DUE_ASSIGNED && $this->assignmentMapper->isUserAssigned($card->getId(), $user->getUID())) {
|
||||
// Notify if the user is assigned and has the assigned setting selected
|
||||
$shouldNotify = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user