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

Fix loading and activity warning

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-11-10 11:04:15 +01:00
parent 24db3fbdc9
commit a56907862c
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Activity/DeckProvider.php
View File

@@ -142,7 +142,11 @@ class DeckProvider implements IProvider {
$placeholders = $replacements = []; $placeholders = $replacements = [];
foreach ($parameters as $placeholder => $parameter) { foreach ($parameters as $placeholder => $parameter) {
$placeholders[] = '{' . $placeholder . '}'; $placeholders[] = '{' . $placeholder . '}';
if (array_key_exists('name', $parameter)) {
$replacements[] = $parameter['name']; $replacements[] = $parameter['name'];
} else {
$replacements[] = '';
}
} }
$event->setParsedSubject(str_replace($placeholders, $replacements, $subject)) $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))

2
lib/Service/BoardService.php
View File

@@ -88,7 +88,7 @@ class BoardService {
/** /**
* @return array * @return array
*/ */
public function findAll($since = 0) { public function findAll($since = -1) {
$userInfo = $this->getBoardPrerequisites(); $userInfo = $this->getBoardPrerequisites();
$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since); $userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since);
$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since); $groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since);

2
lib/Service/StackService.php
View File

@@ -127,7 +127,7 @@ class StackService {
* @throws \OCA\Deck\NoPermissionException * @throws \OCA\Deck\NoPermissionException
* @throws BadRequestException * @throws BadRequestException
*/ */
public function findAll($boardId, $since = 0) { public function findAll($boardId, $since = -1) {
if (is_numeric($boardId) === false) { if (is_numeric($boardId) === false) {
throw new BadRequestException('boardId must be a number'); throw new BadRequestException('boardId must be a number');
} }