Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-02-13 05:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug, only count unique unread tasks

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-06-11 09:36:45 +02:00
parent 27638e149d
commit d0ff79d191
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Models/TaskMapper.php
View File

@ -335,7 +335,7 @@ final class TaskMapper extends DataMapperAbstract
int $relations = RelationType::ALL, int $relations = RelationType::ALL,
int $depth = 3 int $depth = 3
) : array { ) : array {
$depth = 3; $depth = 3;
$userWhere = new Where(self::$db); $userWhere = new Where(self::$db);
$userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) $userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user); ->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user);
@ -377,7 +377,7 @@ final class TaskMapper extends DataMapperAbstract
int $relations = RelationType::ALL, int $relations = RelationType::ALL,
int $depth = 3 int $depth = 3
) : array { ) : array {
$depth = 3; $depth = 3;
$userWhere = new Where(self::$db); $userWhere = new Where(self::$db);
$userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) $userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user); ->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user);
@ -407,7 +407,7 @@ final class TaskMapper extends DataMapperAbstract
*/ */
public static function hasReadingPermission(int $user, int $task) : bool public static function hasReadingPermission(int $user, int $task) : bool
{ {
$depth = 1; $depth = 1;
$userWhere = new Where(self::$db); $userWhere = new Where(self::$db);
$userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user) $userWhere->where(AccountRelationMapper::getTable() . '.task_account_account', '=', $user)
->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user); ->orWhere(self::$table . '_' . $depth . '.task_created_by', '=', $user);
@ -441,7 +441,7 @@ final class TaskMapper extends DataMapperAbstract
try { try {
$query = new Builder(self::$db); $query = new Builder(self::$db);
$query->count('*') $query->count('DISTINCT ' . self::$table . '.' . self::$primaryField)
->from(self::$table) ->from(self::$table)
->innerJoin(TaskElementMapper::getTable()) ->innerJoin(TaskElementMapper::getTable())
->on(self::$table . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task') ->on(self::$table . '.task_id', '=', TaskElementMapper::getTable() . '.task_element_task')