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

Merge branch 'master' into vue-master

Browse Source
This commit is contained in:
Julius Härtl
2019-08-20 10:57:41 +02:00
parent a5ee26a592 c88b25c627
commit 1eeaff7f29
115 changed files with 4880 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Controller/CardApiController.php
View File

@@ -2,6 +2,8 @@
/**
* @copyright Copyright (c) 2018 Ryan Fletcher <ryan.fletcher@codepassion.ca>
*
* @copyright Copyright (c) 2019, Alexandru Puiu (alexpuiu20@yahoo.com)
*
* @author Ryan Fletcher <ryan.fletcher@codepassion.ca>
*
* @license GNU AGPL version 3 or any later version
@@ -70,11 +72,12 @@ class CardApiController extends ApiController {
* @params $title
* @params $type
* @params $order
* @params $description
*
* Get a specific card.
*/
public function create($title, $type = 'plain', $order = 999) {
$card = $this->cardService->create($title, $this->request->getParam('stackId'), $type, $order, $this->userId);
public function create($title, $type = 'plain', $order = 999, $description = '') {
$card = $this->cardService->create($title, $this->request->getParam('stackId'), $type, $order, $this->userId, $description);
return new DataResponse($card, HTTP::STATUS_OK);
}
@@ -86,8 +89,8 @@ class CardApiController extends ApiController {
*
* Update a card
*/
public function update($title, $type, $order = 0, $description = '', $owner, $duedate = null) {
$card = $this->cardService->update($this->request->getParam('cardId'), $title, $this->request->getParam('stackId'), $type, $order, $description, $owner, $duedate, 0);
public function update($title, $type, $order = 0, $description = '', $owner, $duedate = null, $archived = null) {
$card = $this->cardService->update($this->request->getParam('cardId'), $title, $this->request->getParam('stackId'), $type, $order, $description, $owner, $duedate, 0, $archived);
return new DataResponse($card, HTTP::STATUS_OK);
}

5
lib/Controller/ConfigController.php
View File

@@ -103,12 +103,15 @@ class ConfigController extends Controller {
$groups = array_map(function($groupId) {
/** @var IGroup $groups */
$group = $this->groupManager->get($groupId);
if ($group === null) {
return null;
}
return [
'id' => $group->getGID(),
'displayname' => $group->getDisplayName(),
];
}, $groups);
return $groups;
return array_filter($groups);
}
}