southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Reinitialize offset if greater than number of unread items

Browse source
This commit is contained in:
Frédéric Guillot 2017-12-04 21:24:01 -08:00
parent 56e9a2fdd6
commit eefab601da
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server/ui/controller/unread.go
View file

@ -16,18 +16,23 @@ func (c *Controller) ShowUnreadPage(ctx *core.Context, request *core.Request, re
builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone) builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
builder.WithStatus(model.EntryStatusUnread) builder.WithStatus(model.EntryStatusUnread)
builder.WithOrder(model.DefaultSortingOrder) countUnread, err := builder.CountEntries()
builder.WithDirection(user.EntryDirection)
builder.WithOffset(offset)
builder.WithLimit(nbItemsPerPage)
entries, err := builder.GetEntries()
if err != nil { if err != nil {
response.HTML().ServerError(err) response.HTML().ServerError(err)
return return
} }
countUnread, err := builder.CountEntries() if offset >= countUnread {
offset = 0
}
builder = c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
builder.WithStatus(model.EntryStatusUnread)
builder.WithOrder(model.DefaultSortingOrder)
builder.WithDirection(user.EntryDirection)
builder.WithOffset(offset)
builder.WithLimit(nbItemsPerPage)
entries, err := builder.GetEntries()
if err != nil { if err != nil {
response.HTML().ServerError(err) response.HTML().ServerError(err)
return return