playground
/
gogs
mirror of https://github.com/gogits/gogs.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

changed integrated page number to GET

pull/1725/head
kendaru 9 years ago
parent
87d64acc9f
commit
5c39d3fa7d
6 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      cmd/web.go
  2. 2
      models/repo.go
  3. 6
      routers/repo/stars.go
  4. 6
      routers/repo/watchers.go
  5. 6
      templates/repo/stars.tmpl
  6. 6
      templates/repo/watchers.tmpl

4
cmd/web.go
Unescape View File

@ -514,8 +514,8 @@ func runWeb(ctx *cli.Context) {
m.Get("/labels/", repo.RetrieveLabels, repo.Labels) m.Get("/labels/", repo.RetrieveLabels, repo.Labels)
m.Get("/milestones", repo.Milestones) m.Get("/milestones", repo.Milestones)
m.Get("/branches", repo.Branches) m.Get("/branches", repo.Branches)
m.Get("/stars/?:index", middleware.RepoRef(), repo.Stars) m.Get("/stars", middleware.RepoRef(), repo.Stars)
m.Get("/watchers/?:index", middleware.RepoRef(), repo.Watchers) m.Get("/watchers", middleware.RepoRef(), repo.Watchers)
m.Get("/forks", middleware.RepoRef(), repo.Forks) m.Get("/forks", middleware.RepoRef(), repo.Forks)
m.Get("/archive/*", repo.Download) m.Get("/archive/*", repo.Download)

2
models/repo.go
Unescape View File

@ -48,7 +48,7 @@ var (
Gitignores, Licenses, Readmes []string Gitignores, Licenses, Readmes []string
// Maximum items per page in forks, watchers and stars of a repo // Maximum items per page in forks, watchers and stars of a repo
ItemsPerPage = 3 ItemsPerPage = 54
) )
func LoadRepoConfig() { func LoadRepoConfig() {

6
routers/repo/stars.go
Unescape View File

@ -19,21 +19,21 @@ const (
func Stars(ctx *middleware.Context) { func Stars(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("repos.stars") ctx.Data["Title"] = ctx.Tr("repos.stars")
page := ctx.ParamsInt(":index") page := ctx.QueryInt("page")
if page <= 0 { if page <= 0 {
page = 1 page = 1
} }
ctx.Data["Page"] = paginater.New(ctx.Repo.Repository.NumStars, models.ItemsPerPage, page, 5) ctx.Data["Page"] = paginater.New(ctx.Repo.Repository.NumStars, models.ItemsPerPage, page, 5)
stars, err := ctx.Repo.Repository.GetStars(ctx.ParamsInt(":index")) stars, err := ctx.Repo.Repository.GetStars(ctx.QueryInt("page"))
if err != nil { if err != nil {
ctx.Handle(500, "GetStars", err) ctx.Handle(500, "GetStars", err)
return return
} }
if (ctx.ParamsInt(":index")-1)*models.ItemsPerPage > ctx.Repo.Repository.NumStars { if (ctx.QueryInt("page")-1)*models.ItemsPerPage > ctx.Repo.Repository.NumStars {
ctx.Handle(404, "ctx.Repo.Repository.NumStars", nil) ctx.Handle(404, "ctx.Repo.Repository.NumStars", nil)
return return
} }

6
routers/repo/watchers.go
Unescape View File

@ -19,21 +19,21 @@ const (
func Watchers(ctx *middleware.Context) { func Watchers(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("repos.watches") ctx.Data["Title"] = ctx.Tr("repos.watches")
page := ctx.ParamsInt(":index") page := ctx.QueryInt("page")
if page <= 0 { if page <= 0 {
page = 1 page = 1
} }
ctx.Data["Page"] = paginater.New(ctx.Repo.Repository.NumWatches, models.ItemsPerPage, page, 5) ctx.Data["Page"] = paginater.New(ctx.Repo.Repository.NumWatches, models.ItemsPerPage, page, 5)
watchers, err := ctx.Repo.Repository.GetWatchers(ctx.ParamsInt(":index")) watchers, err := ctx.Repo.Repository.GetWatchers(ctx.QueryInt("page"))
if err != nil { if err != nil {
ctx.Handle(500, "GetWatchers", err) ctx.Handle(500, "GetWatchers", err)
return return
} }
if (ctx.ParamsInt(":index")-1)*models.ItemsPerPage > ctx.Repo.Repository.NumWatches { if (ctx.QueryInt("page")-1)*models.ItemsPerPage > ctx.Repo.Repository.NumWatches {
ctx.Handle(404, "ctx.Repo.Repository.NumWatches", nil) ctx.Handle(404, "ctx.Repo.Repository.NumWatches", nil)
return return
} }

6
templates/repo/stars.tmpl
Unescape View File

@ -35,19 +35,19 @@
{{if gt .TotalPages 1}} {{if gt .TotalPages 1}}
<div class="pagination"> <div class="pagination">
{{if .HasPrevious}} {{if .HasPrevious}}
<a href="{{$.RepoLink}}/stars/{{.Previous}}">{{$.i18n.Tr "issues.previous"}}</a> <a href="{{$.RepoLink}}/stars?page={{.Previous}}">{{$.i18n.Tr "issues.previous"}}</a>
{{end}} {{end}}
{{range .Pages}} {{range .Pages}}
{{if eq .Num -1}} {{if eq .Num -1}}
<a class="disabled item">...</a> <a class="disabled item">...</a>
{{else}} {{else}}
<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.RepoLink}}/stars/{{.Num}}"{{end}}>{{.Num}}</a> <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.RepoLink}}/stars?page={{.Num}}"{{end}}>{{.Num}}</a>
{{end}} {{end}}
{{end}} {{end}}
{{if .HasNext}} {{if .HasNext}}
<a href="{{$.RepoLink}}/stars/{{.Next}}">{{$.i18n.Tr "issues.next"}}</a> <a href="{{$.RepoLink}}/stars?page={{.Next}}">{{$.i18n.Tr "issues.next"}}</a>
{{end}} {{end}}
</div> </div>
{{end}} {{end}}

6
templates/repo/watchers.tmpl
Unescape View File

@ -35,19 +35,19 @@
{{if gt .TotalPages 1}} {{if gt .TotalPages 1}}
<div class="pagination"> <div class="pagination">
{{if .HasPrevious}} {{if .HasPrevious}}
<a href="{{$.RepoLink}}/watchers/{{.Previous}}">{{$.i18n.Tr "issues.previous"}}</a> <a href="{{$.RepoLink}}/watchers?page={{.Previous}}">{{$.i18n.Tr "issues.previous"}}</a>
{{end}} {{end}}
{{range .Pages}} {{range .Pages}}
{{if eq .Num -1}} {{if eq .Num -1}}
<a class="disabled item">...</a> <a class="disabled item">...</a>
{{else}} {{else}}
<a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.RepoLink}}/watchers/{{.Num}}"{{end}}>{{.Num}}</a> <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.RepoLink}}/watchers?page={{.Num}}"{{end}}>{{.Num}}</a>
{{end}} {{end}}
{{end}} {{end}}
{{if .HasNext}} {{if .HasNext}}
<a href="{{$.RepoLink}}/watchers/{{.Next}}">{{$.i18n.Tr "issues.next"}}</a> <a href="{{$.RepoLink}}/watchers?page={{.Next}}">{{$.i18n.Tr "issues.next"}}</a>
{{end}} {{end}}
</div> </div>
{{end}} {{end}}

Write Preview
Loading…
Cancel
Save