Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1693 from sapk/fix-admin-repo-new-ui

Browse source 
Fix admin repos new ui
This commit is contained in:
无闻 2015-09-25 19:05:27 -04:00
commit 84c727ae66
5 changed files with 95 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/app.ini
View file

@ -21,6 +21,8 @@ ISSUE_PAGING_NUM = 10
[ui.admin] [ui.admin]
; Number of users that are showed in one page ; Number of users that are showed in one page
USER_PAGING_NUM = 50 USER_PAGING_NUM = 50
; Number of repos that are showed in one page
REPO_PAGING_NUM = 50
; Number of notices that are showed in one page ; Number of notices that are showed in one page
NOTICE_PAGING_NUM = 50 NOTICE_PAGING_NUM = 50
; Number of organization that are showed in one page ; Number of organization that are showed in one page

13
models/repo.go
View file

@ -775,15 +775,13 @@ func CountRepositories() int64 {
func CountPublicRepositories() int64 { func CountPublicRepositories() int64 {
return countRepositories(false) return countRepositories(false)
} }
// RepositoriesWithUsers returns number of repos in given page.
// GetRepositoriesWithUsers returns given number of repository objects with offset. func RepositoriesWithUsers(page, pageSize int) ([]*Repository, error) {
// It also auto-gets corresponding users. repos := make([]*Repository, 0, pageSize)
func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) { if err := x.Limit(pageSize, (page-1)*pageSize).Asc("id").Find(&repos); err != nil {
repos := make([]*Repository, 0, num)
if err := x.Limit(num, offset).Asc("id").Find(&repos); err != nil {
return nil, err return nil, err
} }
for _, repo := range repos { for _, repo := range repos {
repo.Owner = &User{Id: repo.OwnerID} repo.Owner = &User{Id: repo.OwnerID}
has, err := x.Get(repo.Owner) has, err := x.Get(repo.Owner)
@ -795,6 +793,7 @@ func GetRepositoriesWithUsers(num, offset int) ([]*Repository, error) {
} }
return repos, nil return repos, nil
} }
// RepoPath returns repository path by given user and repository name. // RepoPath returns repository path by given user and repository name.

2
modules/setting/setting.go
View file

@ -94,6 +94,7 @@ var (
ExplorePagingNum int ExplorePagingNum int
IssuePagingNum int IssuePagingNum int
AdminUserPagingNum int AdminUserPagingNum int
AdminRepoPagingNum int
AdminNoticePagingNum int AdminNoticePagingNum int
AdminOrgPagingNum int AdminOrgPagingNum int
@ -372,6 +373,7 @@ func NewContext() {
sec = Cfg.Section("ui.admin") sec = Cfg.Section("ui.admin")
AdminUserPagingNum = sec.Key("USER_PAGING_NUM").MustInt(50) AdminUserPagingNum = sec.Key("USER_PAGING_NUM").MustInt(50)
AdminRepoPagingNum = sec.Key("REPO_PAGING_NUM").MustInt(50)
AdminNoticePagingNum = sec.Key("NOTICE_PAGING_NUM").MustInt(50) AdminNoticePagingNum = sec.Key("NOTICE_PAGING_NUM").MustInt(50)
AdminOrgPagingNum = sec.Key("ORG_PAGING_NUM").MustInt(50) AdminOrgPagingNum = sec.Key("ORG_PAGING_NUM").MustInt(50)

22
routers/admin/repos.go
View file

@ -5,17 +5,20 @@
package admin package admin
import ( import (
"github.com/Unknwon/paginater"
"math" "math"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
) )
const ( const (
REPOS base.TplName = "admin/repo/list" REPOS base.TplName = "admin/repo/list"
) )
//* TODO Remove after general using of github.com/Unknwon/paginater
func pagination(ctx *middleware.Context, count int64, pageNum int) int { func pagination(ctx *middleware.Context, count int64, pageNum int) int {
p := ctx.QueryInt("p") p := ctx.QueryInt("p")
if p < 1 { if p < 1 {
@ -33,19 +36,28 @@ func pagination(ctx *middleware.Context, count int64, pageNum int) int {
return p return p
} }
//*/
func Repositories(ctx *middleware.Context) { func Repositories(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("admin.repositories") ctx.Data["Title"] = ctx.Tr("admin.repositories")
ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdmin"] = true
ctx.Data["PageIsAdminRepositories"] = true ctx.Data["PageIsAdminRepositories"] = true
pageNum := 50 total := models.CountRepositories()
p := pagination(ctx, models.CountRepositories(), pageNum) page := ctx.QueryInt("page")
if page <= 1 {
page = 1
}
ctx.Data["Page"] = paginater.New(int(total), setting.AdminRepoPagingNum, page, 5)
repos, err := models.RepositoriesWithUsers(page, setting.AdminRepoPagingNum)
var err error
ctx.Data["Repos"], err = models.GetRepositoriesWithUsers(pageNum, (p-1)*pageNum)
if err != nil { if err != nil {
ctx.Handle(500, "GetRepositoriesWithUsers", err) ctx.Handle(500, "RepositoriesWithUsers", err)
return return
} }
ctx.Data["Repos"] = repos
ctx.Data["Total"] = total
ctx.HTML(200, REPOS) ctx.HTML(200, REPOS)
} }

126
templates/admin/repo/list.tmpl
View file

@ -1,60 +1,70 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="admin user">
<div id="admin-wrapper"> <div class="ui container">
<div id="setting-wrapper" class="main-wrapper"> <div class="ui grid">
<div id="admin-setting" class="container clear"> {{template "admin/navbar" .}}
{{template "admin/nav" .}} <div class="twelve wide column content">
<div class="grid-4-5 left"> {{template "base/alert" .}}
<div class="setting-content"> <h4 class="ui top attached header">
{{template "ng/base/alert" .}} {{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
<div id="setting-content"> </h4>
<div class="panel panel-radius"> <div class="ui attached table segment">
<div class="panel-header"> <table class="ui very basic striped table">
<strong>{{.i18n.Tr "admin.repos.repo_manage_panel"}}</strong> <thead>
</div> <tr>
<div class="panel-body admin-panel"> <th>ID</th>
<div class="admin-table"> <th>{{.i18n.Tr "admin.repos.owner"}}</th>
<table class="table table-striped"> <th>{{.i18n.Tr "admin.repos.name"}}</th>
<thead> <th>{{.i18n.Tr "admin.repos.private"}}</th>
<tr> <th>{{.i18n.Tr "admin.repos.watches"}}</th>
<th>ID</th> <th>{{.i18n.Tr "admin.repos.stars"}}</th>
<th>{{.i18n.Tr "admin.repos.owner"}}</th> <th>{{.i18n.Tr "admin.repos.issues"}}</th>
<th>{{.i18n.Tr "admin.repos.name"}}</th> <th>{{.i18n.Tr "admin.users.created"}}</th>
<th>{{.i18n.Tr "admin.repos.private"}}</th> </tr>
<th>{{.i18n.Tr "admin.repos.watches"}}</th> </thead>
<th>{{.i18n.Tr "admin.repos.stars"}}</th> <tbody>
<th>{{.i18n.Tr "admin.repos.issues"}}</th> {{range .Repos}}
<th>{{.i18n.Tr "admin.users.created"}}</th> <tr>
</tr> <td>{{.ID}}</td>
</thead> <td><a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a></td>
<tbody> <td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td>
{{range .Repos}} <td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td>
<tr> <td>{{.NumWatches}}</td>
<td>{{.ID}}</td> <td>{{.NumStars}}</td>
<td><a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a></td> <td>{{.NumIssues}}</td>
<td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td> <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
<td><i class="fa fa{{if .IsPrivate}}-check{{end}}-square-o"></i></td> </tr>
<td>{{.NumWatches}}</td> {{end}}
<td>{{.NumStars}}</td> </tbody>
<td>{{.NumIssues}}</td> </table>
<td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td> </div>
</tr>
{{end}} {{with .Page}}
</tbody> {{if gt .TotalPages 1}}
</table> <div class="center page buttons">
{{if or .LastPageNum .NextPageNum}} <div class="ui borderless pagination menu">
<ul class="pagination"> <a class="{{if .IsFirst}}disabled{{end}} item" href="{{$.Link}}"><i class="angle double left icon"></i> {{$.i18n.Tr "admin.first_page"}}</a>
{{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/repos?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}} <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?page={{.Previous}}"{{end}}>
{{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/repos?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}} <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}}
</ul> </a>
{{end}} {{range .Pages}}
</div> {{if eq .Num -1}}
</div> <a class="disabled item">...</a>
</div> {{else}}
</div> <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?page={{.Num}}"{{end}}>{{.Num}}</a>
</div> {{end}}
</div> {{end}}
</div> <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?page={{.Next}}"{{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}}">{{$.i18n.Tr "admin.last_page"}}&nbsp;<i class="angle double right icon"></i></a>
</div>
</div>
{{end}}
{{end}}
</div>
</div> </div>
</div>
</div> </div>
{{template "ng/base/footer" .}} {{template "base/footer" .}}