Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2026-05-09 05:10:19 +02:00
Code Issues Projects Releases Wiki Activity

fix(api): exception on unpaged empty content

Browse source
This commit is contained in:
Gauthier Roebroeck 2020-06-30 08:40:49 +08:00
parent 4ed35d2764
commit 2cc27f244c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesCollectionDao.kt
View file

@ -65,7 +65,7 @@ class SeriesCollectionDao(
return PageImpl( return PageImpl(
items, items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
else PageRequest.of(0, count.toInt(), pageSort), else PageRequest.of(0, maxOf(count.toInt(), 20), pageSort),
count.toLong() count.toLong()
) )
} }
@ -95,7 +95,7 @@ class SeriesCollectionDao(
return PageImpl( return PageImpl(
items, items,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
else PageRequest.of(0, count.toInt(), pageSort), else PageRequest.of(0, maxOf(count, 20), pageSort),
count.toLong() count.toLong()
) )
} }

2
komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt
View file

@ -132,7 +132,7 @@ class SeriesDtoDao(
return PageImpl( return PageImpl(
dtos, dtos,
if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort) if (pageable.isPaged) PageRequest.of(pageable.pageNumber, pageable.pageSize, pageSort)
else PageRequest.of(0, count.toInt(), pageSort), else PageRequest.of(0, maxOf(count, 20), pageSort),
count.toLong() count.toLong()
) )
} }