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

Merge pull request #736 from nextcloud/bugfix/noid/remove-card-parameter-when-its-null

Browse Source 
Remove card parameter when it's null
This commit is contained in:
Julius Härtl
2018-11-23 15:31:04 +01:00
committed by GitHub
parent 135d7741d2 2c024dedce
commit 50faa97558
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Activity/DeckProvider.php
View File

@@ -79,7 +79,16 @@ class DeckProvider implements IProvider {
/** /**
* Map stored parameter objects to rich string types * Map stored parameter objects to rich string types
*/ */
$board = null;
$author = $event->getAuthor();
$user = $this->userManager->get($author);
$params = [
'user' => [
'type' => 'user',
'id' => $author,
'name' => $user !== null ? $user->getDisplayName() : $author
],
];
if ($event->getObjectType() === ActivityManager::DECK_OBJECT_BOARD) { if ($event->getObjectType() === ActivityManager::DECK_OBJECT_BOARD) {
$board = [ $board = [
'type' => 'highlight', 'type' => 'highlight',
@@ -87,9 +96,9 @@ class DeckProvider implements IProvider {
'name' => $event->getObjectName(), 'name' => $event->getObjectName(),
'link' => $this->deckUrl('/board/' . $event->getObjectId()), 'link' => $this->deckUrl('/board/' . $event->getObjectId()),
]; ];
$params['board'] = $board;
} }
$card = null;
if ($event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) { if ($event->getObjectType() === ActivityManager::DECK_OBJECT_CARD) {
$card = [ $card = [
'type' => 'highlight', 'type' => 'highlight',
@@ -101,20 +110,9 @@ class DeckProvider implements IProvider {
$archivedParam = $subjectParams['card']['archived'] ? 'archived' : ''; $archivedParam = $subjectParams['card']['archived'] ? 'archived' : '';
$card['link'] = $this->deckUrl('/board/' . $subjectParams['board']['id'] . '/' . $archivedParam . '/card/' . $event->getObjectId()); $card['link'] = $this->deckUrl('/board/' . $subjectParams['board']['id'] . '/' . $archivedParam . '/card/' . $event->getObjectId());
} }
$params['card'] = $card;
} }
$author = $event->getAuthor();
$user = $this->userManager->get($author);
$params = [
'board' => $board,
'card' => $card,
'user' => [
'type' => 'user',
'id' => $author,
'name' => $user !== null ? $user->getDisplayName() : $author
],
];
$params = $this->parseParamForBoard('board', $subjectParams, $params); $params = $this->parseParamForBoard('board', $subjectParams, $params);
$params = $this->parseParamForStack('stack', $subjectParams, $params); $params = $this->parseParamForStack('stack', $subjectParams, $params);
$params = $this->parseParamForStack('stackBefore', $subjectParams, $params); $params = $this->parseParamForStack('stackBefore', $subjectParams, $params);

3
tests/unit/Activity/DeckProviderTest.php
View File

@@ -180,7 +180,6 @@ class DeckProviderTest extends TestCase {
'name' => 'Board', 'name' => 'Board',
'link' => '#!/board/1', 'link' => '#!/board/1',
], ],
'card' => null,
'user' => [ 'user' => [
'type' => 'user', 'type' => 'user',
'id' => 'admin', 'id' => 'admin',
@@ -216,7 +215,6 @@ class DeckProviderTest extends TestCase {
$this->provider->parse('en_US', $event); $this->provider->parse('en_US', $event);
$data = [ $data = [
'board' => null,
'card' => [ 'card' => [
'type' => 'highlight', 'type' => 'highlight',
'id' => 1, 'id' => 1,
@@ -266,7 +264,6 @@ class DeckProviderTest extends TestCase {
$this->provider->parse('en_US', $event); $this->provider->parse('en_US', $event);
$data = [ $data = [
'board' => null,
'card' => [ 'card' => [
'type' => 'highlight', 'type' => 'highlight',
'id' => 1, 'id' => 1,