lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #73 from bkcsoft/gt/2164-release-pagination 

Add Pagination to Releases-page (and de-duplicate pagination templates)
release/v1.15
Lunny Xiao 2016-11-08 10:39:03 +08:00 committed by GitHub
parent 864d1b1f9f 562f9b6eae
commit 5667d4daae
13 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/release.go
View File

@ -138,8 +138,11 @@ func GetReleaseByID(id int64) (*Release, error) {
}
// GetReleasesByRepoID returns a list of releases of repository.
func GetReleasesByRepoID(repoID int64) (rels []*Release, err error) {
err = x.Desc("created_unix").Find(&rels, Release{RepoID: repoID})
func GetReleasesByRepoID(repoID int64, page, pageSize int) (rels []*Release, err error) {
if page <= 0 {
page = 1
}
err = x.Desc("created_unix").Limit(pageSize, (page-1)*pageSize).Find(&rels, Release{RepoID: repoID})
return rels, err
}

9
routers/repo/release.go
View File

@ -7,6 +7,7 @@ package repo
import (
"fmt"
"github.com/Unknwon/paginater"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/base"
@ -58,7 +59,11 @@ func Releases(ctx *context.Context) {
return
}
releases, err := models.GetReleasesByRepoID(ctx.Repo.Repository.ID)
page := ctx.QueryInt("page")
if page <= 1 {
page = 1
}
releases, err := models.GetReleasesByRepoID(ctx.Repo.Repository.ID, page, 10)
if err != nil {
ctx.Handle(500, "GetReleasesByRepoID", err)
return
@ -141,6 +146,8 @@ func Releases(ctx *context.Context) {
r.Note = markdown.RenderString(r.Note, ctx.Repo.RepoLink, ctx.Repo.Repository.ComposeMetas())
tags = append(tags, r)
}
pager := paginater.New(ctx.Repo.Repository.NumTags, 10, page, 5)
ctx.Data["Page"] = pager
models.SortReleases(tags)
ctx.Data["Releases"] = tags
ctx.HTML(200, RELEASES)

23
templates/admin/base/page.tmpl
View File

@ -1,23 +0,0 @@
{{with .Page}}
{{if gt .TotalPages 1}}
<div class="center page buttons">
<div class="ui borderless pagination menu">
<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}?q={{$.Keyword}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}&q={{$.Keyword}}"{{end}}>
<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
</a>
{{range .Pages}}
{{if eq .Num -1}}
<a class="disabled item">...</a>
{{else}}
<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}&q={{$.Keyword}}"{{end}}>{{.Num}}</a>
{{end}}
{{end}}
<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}&q={{$.Keyword}}"{{end}}>
{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
</a>
<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}&q={{$.Keyword}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
</div>
</div>
{{end}}
{{end}}

2
templates/admin/org/list.tmpl
View File

@ -40,7 +40,7 @@
</table>
</div>
{{template "admin/base/page" .}}
{{template "base/paginate" .}}
</div>
</div>
</div>

2
templates/admin/repo/list.tmpl
View File

@ -44,7 +44,7 @@
</table>
</div>
{{template "admin/base/page" .}}
{{template "base/paginage" .}}
</div>
</div>
</div>

2
templates/admin/user/list.tmpl
View File

@ -45,7 +45,7 @@
</table>
</div>
{{template "admin/base/page" .}}
{{template "base/paginate" .}}
</div>
</div>
</div>

4
templates/explore/page.tmpl → templates/base/paginate.tmpl
View File

@ -2,6 +2,7 @@
{{if gt .TotalPages 1}}
<div class="center page buttons">
<div class="ui borderless pagination menu">
<a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}?q={{$.Keyword}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
<a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}&q={{$.Keyword}}"{{end}}>
<i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
</a>
@ -13,8 +14,9 @@
{{end}}
{{end}}
<a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}&q={{$.Keyword}}"{{end}}>
{{$.i18n.Tr "repo.issues.next"}} <i class="icon right arrow"></i>
{{$.i18n.Tr "repo.issues.next"}}&nbsp;<i class="icon right arrow"></i>
</a>
<a class="{{if .IsLast}}disabled{{end}} item" href="{{$.Link}}?page={{.TotalPages}}&q={{$.Keyword}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
</div>
</div>
{{end}}

2
templates/explore/organizations.tmpl
View File

@ -27,7 +27,7 @@
{{end}}
</div>
{{template "explore/page" .}}
{{template "base/paginate" .}}
</div>
</div>
</div>

2
templates/explore/repos.tmpl
View File

@ -6,7 +6,7 @@
<div class="twelve wide column content">
{{template "explore/search" .}}
{{template "explore/repo_list" .}}
{{template "explore/page" .}}
{{template "base/paginate" .}}
</div>
</div>
</div>

2
templates/explore/users.tmpl
View File

@ -27,7 +27,7 @@
{{end}}
</div>
{{template "explore/page" .}}
{{template "base/paginate" .}}
</div>
</div>
</div>

2
templates/org/home.tmpl
View File

@ -32,7 +32,7 @@
<div class="ui divider"></div>
{{end}}
{{template "explore/repo_list" .}}
{{template "explore/page" .}}
{{template "base/paginate" .}}
</div>
<div class="ui five wide column">

1
templates/repo/release/list.tmpl
View File

@ -75,6 +75,7 @@
</li>
{{end}}
</ul>
{{template "base/paginage" .}}
</div>
</div>
{{template "base/footer" .}}

2
templates/user/profile.tmpl
View File

@ -86,7 +86,7 @@
</div>
{{if ne .TabName "activity"}}
{{template "explore/repo_list" .}}
{{template "explore/page" .}}
{{template "base/paginate" .}}
{{else}}
<br>
<div class="feeds">