Merge remote-tracking branch 'origin/master' into vue

This commit is contained in:
Julius Härtl
2019-12-17 20:36:16 +01:00
108 changed files with 1839 additions and 673 deletions

View File

@@ -431,7 +431,7 @@ class CardService {
$result[$card->getOrder()] = $card;
}
$this->changeHelper->cardChanged($id, false);
return $result;
return array_values($result);
}
/**

View File

@@ -345,7 +345,7 @@ class StackService {
throw new BadRequestException('order must be provided');
}
$this->permissionService->checkPermission($this->stackMapper, $id, Acl::PERMISSION_EDIT);
$this->permissionService->checkPermission($this->stackMapper, $id, Acl::PERMISSION_MANAGE);
$stackToSort = $this->stackMapper->find($id);
$stacks = $this->stackMapper->findAll($stackToSort->getBoardId());
$result = [];