From 36d7f9a0551a98eda1ff2a871254ff19128e7f63 Mon Sep 17 00:00:00 2001 From: jan Date: Wed, 30 Dec 2015 09:32:47 +0100 Subject: =?UTF-8?q?jetzt=20auch=20mit=20korrekter=20lastPage=20berechnung.?= =?UTF-8?q?=20ich=20sollte=20diese=20krasse=20funktion=20nach=20mir=20bene?= =?UTF-8?q?nnen,=20damit=20auch=20ich=20in=20die=20geschichtsb=C3=BCcher?= =?UTF-8?q?=20eingehen=20kann.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/frontend/utility.go b/frontend/utility.go index 28e7db1..6dbef6a 100644 --- a/frontend/utility.go +++ b/frontend/utility.go @@ -13,7 +13,7 @@ func PaginationFromPage(pageRange, currentPage, maxPage int) PaginationRange { var after []int startPage := currentPage - pageRange - endPage := currentPage + pageRange + 1 + endPage := currentPage + pageRange if startPage < 1 { endPage += -startPage + 1 @@ -36,7 +36,7 @@ func PaginationFromPage(pageRange, currentPage, maxPage int) PaginationRange { before = append(before, i) } - for i := currentPage + 1; i < endPage; i++ { + for i := currentPage + 1; i < endPage+1; i++ { after = append(after, i) } diff --git a/modules/tags/tags.go b/modules/tags/tags.go index 650fa4e..4019f8a 100644 --- a/modules/tags/tags.go +++ b/modules/tags/tags.go @@ -2,6 +2,7 @@ package tags import ( "log" + "math" "net/http" "strconv" @@ -77,7 +78,7 @@ func (m *Module) viewTagPage(w http.ResponseWriter, r *http.Request, p httproute http.Redirect(w, r, "/", 302) return } - pageCount := (int)((float64)(pageNum)/12.0 + 0.5) + pageCount := (int)(math.Ceil(float64(pageNum) / 12.0)) if pageNumber > pageCount { pageNumber = pageCount -- cgit v0.10.1