ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2517 from nextcloud/bugfix/2482

Browse Source 
Filter out duplicate cards in overview
This commit is contained in:
Julius Härtl
2020-11-11 08:23:06 +01:00
committed by GitHub
parent cc871f341c a7f8c183d5
commit 8c1774c6c1
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Db/RelationalEntity.php
View File

@@ -86,6 +86,10 @@ class RelationalEntity extends Entity implements \JsonSerializable {
return $json; return $json;
} }
public function __toString(): string {
return (string)$this->getId();
}
/* /*
* Resolve relational data from external methods * Resolve relational data from external methods
* *

10
lib/Service/BoardService.php
View File

@@ -119,15 +119,7 @@ class BoardService {
$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since, $includeArchived); $userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since, $includeArchived);
$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since, $includeArchived); $groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since, $includeArchived);
$circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null, $since, $includeArchived); $circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null, $since, $includeArchived);
$mergedBoards = array_merge($userBoards, $groupBoards, $circleBoards); return array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
$result = [];
/** @var Board $item */
foreach ($mergedBoards as &$item) {
if (!array_key_exists($item->getId(), $result)) {
$result[$item->getId()] = $item;
}
}
return array_values($result);
} }
/** /**
* @return array * @return array

2
lib/Service/OverviewService.php
View File

@@ -140,7 +140,7 @@ class OverviewService {
$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null); $userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null);
$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null); $groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null);
$circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null); $circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null);
return array_merge($userBoards, $groupBoards, $circleBoards); return array_unique(array_merge($userBoards, $groupBoards, $circleBoards));
} }
private function getBoardPrerequisites($userId): array { private function getBoardPrerequisites($userId): array {