This commit is contained in:
Unknwon 2015-09-25 19:07:21 -04:00
parent 84c727ae66
commit 986447335d
5 changed files with 8 additions and 28 deletions

View File

@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](public/img/gogs-large-resize.png)
##### Current version: 0.6.13 Beta
##### Current version: 0.6.14 Beta
<table>
<tr>
@ -102,6 +102,8 @@ There are 5 ways to install Gogs:
### Deploy to Cloud
- [OpenShift](https://github.com/tkisme/gogs-openshift)
- [Cloudron](https://cloudron.io/appstore.html#io.gogs.cloudronapp)
- [Scaleway](https://www.scaleway.com/imagehub/gogs/)
## Acknowledgments

View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.6.13.0918 Beta"
const APP_VER = "0.6.14.0925 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

View File

@ -775,6 +775,7 @@ func CountRepositories() int64 {
func CountPublicRepositories() int64 {
return countRepositories(false)
}
// RepositoriesWithUsers returns number of repos in given page.
func RepositoriesWithUsers(page, pageSize int) ([]*Repository, error) {
repos := make([]*Repository, 0, pageSize)
@ -793,7 +794,6 @@ func RepositoriesWithUsers(page, pageSize int) ([]*Repository, error) {
}
return repos, nil
}
// RepoPath returns repository path by given user and repository name.

View File

@ -6,7 +6,6 @@ package admin
import (
"github.com/Unknwon/paginater"
"math"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
@ -18,25 +17,6 @@ const (
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 {
p := ctx.QueryInt("p")
if p < 1 {
p = 1
}
curCount := int64((p-1)*pageNum + pageNum)
if curCount >= count {
p = int(math.Ceil(float64(count) / float64(pageNum)))
} else {
ctx.Data["NextPageNum"] = p + 1
}
if p > 1 {
ctx.Data["LastPageNum"] = p - 1
}
return p
}
//*/
func Repositories(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("admin.repositories")
ctx.Data["PageIsAdmin"] = true
@ -50,14 +30,12 @@ func Repositories(ctx *middleware.Context) {
ctx.Data["Page"] = paginater.New(int(total), setting.AdminRepoPagingNum, page, 5)
repos, err := models.RepositoriesWithUsers(page, setting.AdminRepoPagingNum)
if err != nil {
ctx.Handle(500, "RepositoriesWithUsers", err)
return
}
ctx.Data["Repos"] = repos
ctx.Data["Total"] = total
ctx.Data["Total"] = total
ctx.HTML(200, REPOS)
}

View File

@ -1 +1 @@
0.6.13.0918 Beta
0.6.14.0925 Beta