Skip to content

Commit 2320a0e

Browse files
Merge pull request #71 from /issues/69
#69 - index error
2 parents 3c9fc20 + d2c8cc9 commit 2320a0e

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

src/Http/Controllers/ContentApiController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(HeadlessH5PServiceContract $hh5pService, H5PContentR
3333
public function index(ContentListRequest $request): JsonResponse
3434
{
3535
$contentFilterDto = ContentFilterCriteriaDto::instantiateFromRequest($request);
36-
$columns = ['title', 'id', 'library_id'];
36+
$columns = ['hh5p_contents.title', 'hh5p_contents.id', 'hh5p_contents.library_id'];
3737
$list = $request->get('per_page') !== null && $request->get('per_page') == 0 ?
3838
$this->contentRepository->unpaginatedList($contentFilterDto, $columns) :
3939
$this->contentRepository->list($contentFilterDto, $request->get('per_page'), $columns);

src/Repositories/Contracts/H5PContentRepositoryContract.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,16 @@ public function create(string $title, string $library, string $params, string $n
1515

1616
public function edit(int $id, string $title, string $library, string $params, string $nonce): int;
1717

18-
public function list(ContentFilterCriteriaDto $contentFilterDto, $per_page = 15, array $columns = ['*']): LengthAwarePaginator;
19-
20-
public function unpaginatedList(ContentFilterCriteriaDto $contentFilterDto, array $columns = ['*']): Collection;
18+
public function list(
19+
ContentFilterCriteriaDto $contentFilterDto,
20+
$per_page = 15,
21+
array $columns = ['hh5p_contents.*']
22+
): LengthAwarePaginator;
23+
24+
public function unpaginatedList(
25+
ContentFilterCriteriaDto $contentFilterDto,
26+
array $columns = ['hh5p_contents.*']
27+
): Collection;
2128

2229
public function delete(int $id): int;
2330

src/Repositories/H5PContentRepository.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,10 @@ public function list(
147147
return $paginator;
148148
}
149149

150-
public function unpaginatedList(ContentFilterCriteriaDto $contentFilterDto, array $columns = ['*']): Collection
151-
{
150+
public function unpaginatedList(
151+
ContentFilterCriteriaDto $contentFilterDto,
152+
array $columns = ['hh5p_contents.*']
153+
): Collection {
152154
$query = $this->getQueryContent($contentFilterDto, $columns);
153155
$list = $query->get();
154156

0 commit comments

Comments
 (0)