Improve notification pager (#9821)

Co-authored-by: Antoine GIRARD <[email protected]>
go-gitea · Jan 17, 2020 · b641c68 · b641c68
1 parent 2f3a602
commit b641c68
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/routers/user/notification.go b/routers/user/notification.go
@@ -61,6 +61,19 @@ func Notifications(c *context.Context) {
  status = models.NotificationStatusUnread
  }
 
+ total, err := models.GetNotificationCount(c.User, status)
+ if err != nil {
+ c.ServerError("ErrGetNotificationCount", err)
+ return
+ }
+
+ // redirect to last page if request page is more than total pages
+ pager := context.NewPagination(int(total), perPage, page, 5)
+ if pager.Paginater.Current() < page {
+ c.Redirect(fmt.Sprintf("/notifications?q=%s&page=%d", c.Query("q"), pager.Paginater.Current()))
+ return
+ }
+
  statuses := []models.NotificationStatus{status, models.NotificationStatusPinned}
  notifications, err := models.NotificationsForUser(c.User, statuses, page, perPage)
  if err != nil {
@@ -87,12 +100,6 @@ func Notifications(c *context.Context) {
  return
  }
 
- total, err := models.GetNotificationCount(c.User, status)
- if err != nil {
- c.ServerError("ErrGetNotificationCount", err)
- return
- }
-
  title := c.Tr("notifications")
  if status == models.NotificationStatusUnread && total > 0 {
  title = fmt.Sprintf("(%d) %s", total, title)
@@ -102,7 +109,6 @@ func Notifications(c *context.Context) {
  c.Data["Status"] = status
  c.Data["Notifications"] = notifications
 
- pager := context.NewPagination(int(total), perPage, page, 5)
  pager.SetDefaultParams(c)
  c.Data["Page"] = pager
 
@@ -134,7 +140,7 @@ func NotificationStatusPost(c *context.Context) {
  return
  }
 
- url := fmt.Sprintf("%s/notifications", setting.AppSubURL)
+ url := fmt.Sprintf("%s/notifications?page=%s", setting.AppSubURL, c.Query("page"))
  c.Redirect(url, 303)
 }
 

diff --git a/templates/user/notification/notification.tmpl b/templates/user/notification/notification.tmpl
@@ -88,6 +88,7 @@
  {{$.CsrfTokenHtml}}
  <input type="hidden" name="notification_id" value="{{$notification.ID}}" />
  <input type="hidden" name="status" value="read" />
+ <input type="hidden" name="page" value="{{$.Page.Paginater.Current}}" />
  <button class="ui mini button" title='{{$.i18n.Tr "notification.mark_as_read"}}'>
  <i class="octicon octicon-check"></i>
  </button>
@@ -97,6 +98,7 @@
  {{$.CsrfTokenHtml}}
  <input type="hidden" name="notification_id" value="{{$notification.ID}}" />
  <input type="hidden" name="status" value="unread" />
+ <input type="hidden" name="page" value="{{$.Page.Paginater.Current}}" />
  <button class="ui mini button" title='{{$.i18n.Tr "notification.mark_as_unread"}}'>
  <i class="octicon octicon-bell"></i>
  </button>