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

Merge pull request #686 from nextcloud/release/0.5.0-rc1

Browse Source 
Release 0.5.0-rc1
This commit is contained in:
Julius Härtl
2018-11-10 11:16:02 +01:00
committed by GitHub
parent 9cf30dc77b 4aea8817df
commit 6c5f09e1f9
6 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Activity/DeckProvider.php
View File

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

2
lib/Service/BoardService.php
View File

@@ -88,7 +88,7 @@ class BoardService {
/**
* @return array
*/
public function findAll($since = 0) {
public function findAll($since = -1) {
$userInfo = $this->getBoardPrerequisites();
$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], 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 BadRequestException
*/
public function findAll($boardId, $since = 0) {
public function findAll($boardId, $since = -1) {
if (is_numeric($boardId) === false) {
throw new BadRequestException('boardId must be a number');
}