From 436e8de1f2305a6e1e153fd396b00e51b512690c Mon Sep 17 00:00:00 2001 From: Las Zenow Date: Wed, 31 Oct 2012 10:37:21 +0100 Subject: [PATCH] Fix the pagination on moderation --- admin.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/admin.go b/admin.go index 6e57a14..a77acaf 100644 --- a/admin.go +++ b/admin.go @@ -177,9 +177,13 @@ func newHandler(w http.ResponseWriter, r *http.Request) { return } + err := r.ParseForm() + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } page := 0 if len(r.Form["p"]) != 0 { - var err error page, err = strconv.Atoi(r.Form["p"][0]) if err != nil { page = 0 @@ -190,7 +194,11 @@ func newHandler(w http.ResponseWriter, r *http.Request) { var data newData data.S = GetStatus(w, r) data.Found = num - data.Books = make([]newBook, num) + if num-NEW_ITEMS_PAGE*page < NEW_ITEMS_PAGE { + data.Books = make([]newBook, num-NEW_ITEMS_PAGE*page) + } else { + data.Books = make([]newBook, NEW_ITEMS_PAGE) + } for i, b := range res { data.Books[i].B = b _, data.Books[i].TitleFound, _ = db.GetBooks(buildQuery("title:"+b.Title), 1)