Unknwon 9 years ago
parent
commit
986447335d
5 changed files with 8 additions and 28 deletions
  1. 3 1
      README.md
  2. 1 1
      gogs.go
  3. 2 2
      models/repo.go
  4. 1 23
      routers/admin/repos.go
  5. 1 1
      templates/.VERSION

+ 3 - 1
README.md

@@ -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
 

+ 1 - 1
gogs.go

@@ -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())

+ 2 - 2
models/repo.go

@@ -775,13 +775,14 @@ 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)
 	if err := x.Limit(pageSize, (page-1)*pageSize).Asc("id").Find(&repos); err != nil {
 		return nil, err
 	}
-	
+
 	for _, repo := range repos {
 		repo.Owner = &User{Id: repo.OwnerID}
 		has, err := x.Get(repo.Owner)
@@ -793,7 +794,6 @@ func RepositoriesWithUsers(page, pageSize int) ([]*Repository, error) {
 	}
 
 	return repos, nil
-
 }
 
 // RepoPath returns repository path by given user and repository name.

+ 1 - 23
routers/admin/repos.go

@@ -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)
 }

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.6.13.0918 Beta
+0.6.14.0925 Beta