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

Quick fix for filtering out archived boards from calendar

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-10-02 13:50:10 +02:00
parent 3914127b39
commit 79b950e192
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Service/BoardService.php
View File

@@ -107,11 +107,11 @@ class BoardService {
$this->userId = $userId;
}
public function getUserBoards(int $since = -1): array {
public function getUserBoards(int $since = -1, $includeArchived = true): array {
$userInfo = $this->getBoardPrerequisites();
$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since);
$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since);
$circleBoards = $this->boardMapper->findAllByCircles($userInfo['user'], null, null, $since);
$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], 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);
$mergedBoards = array_merge($userBoards, $groupBoards, $circleBoards);
$result = [];
/** @var Board $item */
@@ -125,11 +125,11 @@ class BoardService {
/**
* @return array
*/
public function findAll($since = -1, $details = null) {
public function findAll($since = -1, $details = null, $includeArchived = true) {
if ($this->boardsCache) {
return $this->boardsCache;
}
$complete = $this->getUserBoards($since);
$complete = $this->getUserBoards($since, $includeArchived);
$result = [];
/** @var Board $item */
foreach ($complete as &$item) {