From 46d67acf224d333942ff87cfce9e60c2dd36ad0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Sat, 7 Apr 2018 14:20:42 -0700 Subject: [PATCH] Avoid unread counter to be off by one --- ui/entry.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ui/entry.go b/ui/entry.go index a67fa683..e2c3c006 100644 --- a/ui/entry.go +++ b/ui/entry.go @@ -266,12 +266,6 @@ func (c *Controller) ShowUnreadEntry(ctx *handler.Context, request *handler.Requ return } - args, err := c.getCommonTemplateArgs(ctx) - if err != nil { - response.HTML().ServerError(err) - return - } - builder = c.store.NewEntryQueryBuilder(user.ID) builder.WithStatus(model.EntryStatusUnread) @@ -301,6 +295,13 @@ func (c *Controller) ShowUnreadEntry(ctx *handler.Context, request *handler.Requ } } + // The unread counter have to be fetched after changing the entry status + args, err := c.getCommonTemplateArgs(ctx) + if err != nil { + response.HTML().ServerError(err) + return + } + response.HTML().Render("entry", args.Merge(tplParams{ "entry": entry, "prevEntry": prevEntry,