Clean repo code

5 files changed, 39 insertions, 71 deletions

diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index eafe8cb4..96721bfd 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -112,38 +112,38 @@ func Users(ctx *middleware.Context) {
 	ctx.Data["PageIsUsers"] = true
 
 	var err error
-	ctx.Data["Users"], err = models.GetUsers(100, 0)
+	ctx.Data["Users"], err = models.GetUsers(200, 0)
 	if err != nil {
-		ctx.Handle(200, "admin.Users", err)
+		ctx.Handle(500, "admin.Users", err)
 		return
 	}
 	ctx.HTML(200, "admin/users")
 }
 
-func Auths(ctx *middleware.Context) {
-	ctx.Data["Title"] = "Auth Sources"
-	ctx.Data["PageIsAuths"] = true
+func Repositories(ctx *middleware.Context) {
+	ctx.Data["Title"] = "Repository Management"
+	ctx.Data["PageIsRepos"] = true
 
 	var err error
-	ctx.Data["Sources"], err = models.GetAuths()
+	ctx.Data["Repos"], err = models.GetRepos(200, 0)
 	if err != nil {
-		ctx.Handle(200, "admin.Auths", err)
+		ctx.Handle(500, "admin.Repositories", err)
 		return
 	}
-	ctx.HTML(200, "admin/auths")
+	ctx.HTML(200, "admin/repos")
 }
 
-func Repositories(ctx *middleware.Context) {
-	ctx.Data["Title"] = "Repository Management"
-	ctx.Data["PageIsRepos"] = true
+func Auths(ctx *middleware.Context) {
+	ctx.Data["Title"] = "Auth Sources"
+	ctx.Data["PageIsAuths"] = true
 
 	var err error
-	ctx.Data["Repos"], err = models.GetRepos(100, 0)
+	ctx.Data["Sources"], err = models.GetAuths()
 	if err != nil {
-		ctx.Handle(200, "admin.Repositories", err)
+		ctx.Handle(500, "admin.Auths", err)
 		return
 	}
-	ctx.HTML(200, "admin/repos")
+	ctx.HTML(200, "admin/auths")
 }
 
 func Config(ctx *middleware.Context) {
diff --git a/routers/admin/user.go b/routers/admin/user.go
index f2e1b047..0d60ee9a 100644
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -34,16 +34,15 @@ func NewUserPost(ctx *middleware.Context, form auth.RegisterForm) {
 	ctx.Data["Title"] = "New Account"
 	ctx.Data["PageIsUsers"] = true
 
+	if ctx.HasError() {
+		ctx.HTML(200, "admin/users/new")
+		return
+	}
+
 	if form.Password != form.RetypePasswd {
-		ctx.Data["HasError"] = true
 		ctx.Data["Err_Password"] = true
 		ctx.Data["Err_RetypePasswd"] = true
-		ctx.Data["ErrorMsg"] = "Password and re-type password are not same"
-		auth.AssignForm(form, ctx.Data)
-	}
-
-	if ctx.HasError() {
-		ctx.HTML(200, "admin/users/new")
+		ctx.RenderWithErr("Password and re-type password are not same.", "admin/users/new", &form)
 		return
 	}
 
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index e82c6ae9..19c9dddc 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -8,13 +8,14 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"github.com/gogits/git"
 	"path"
 	"path/filepath"
 	"strings"
 
 	"github.com/go-martini/martini"
 
+	"github.com/gogits/git"
+
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
 	"github.com/gogits/gogs/modules/base"
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index b0ec7618..c3087392 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -11,6 +11,7 @@ import (
 	"github.com/gogits/git"
 
 	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/auth"
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/modules/mailer"
@@ -18,27 +19,22 @@ import (
 )
 
 func Setting(ctx *middleware.Context) {
-	if !ctx.Repo.IsOwner {
-		ctx.Handle(404, "repo.Setting", nil)
-		return
-	}
-
 	ctx.Data["IsRepoToolbarSetting"] = true
 	ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - settings"
 	ctx.HTML(200, "repo/setting")
 }
 
-func SettingPost(ctx *middleware.Context) {
-	if !ctx.Repo.IsOwner {
-		ctx.Error(404)
-		return
-	}
-
+func SettingPost(ctx *middleware.Context, form auth.RepoSettingForm) {
 	ctx.Data["IsRepoToolbarSetting"] = true
 
 	switch ctx.Query("action") {
 	case "update":
-		newRepoName := ctx.Query("name")
+		if ctx.HasError() {
+			ctx.HTML(200, "repo/setting")
+			return
+		}
+
+		newRepoName := form.RepoName
 		// Check if repository name has been changed.
 		if ctx.Repo.Repository.Name != newRepoName {
 			isExist, err := models.IsRepositoryExist(ctx.Repo.Owner, newRepoName)
@@ -57,15 +53,15 @@ func SettingPost(ctx *middleware.Context) {
 			ctx.Repo.Repository.Name = newRepoName
 		}
 
-		br := ctx.Query("branch")
+		br := form.Branch
 
 		if git.IsBranchExist(models.RepoPath(ctx.User.Name, ctx.Repo.Repository.Name), br) {
 			ctx.Repo.Repository.DefaultBranch = br
 		}
-		ctx.Repo.Repository.Description = ctx.Query("desc")
-		ctx.Repo.Repository.Website = ctx.Query("site")
-		ctx.Repo.Repository.IsPrivate = ctx.Query("private") == "on"
-		ctx.Repo.Repository.IsGoget = ctx.Query("goget") == "on"
+		ctx.Repo.Repository.Description = form.Description
+		ctx.Repo.Repository.Website = form.Website
+		ctx.Repo.Repository.IsPrivate = form.Private
+		ctx.Repo.Repository.IsGoget = form.GoGet
 		if err := models.UpdateRepository(ctx.Repo.Repository); err != nil {
 			ctx.Handle(404, "repo.SettingPost(update)", err)
 			return
@@ -73,12 +69,9 @@ func SettingPost(ctx *middleware.Context) {
 		log.Trace("%s Repository updated: %s/%s", ctx.Req.RequestURI, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
 
 		if ctx.Repo.Repository.IsMirror {
-			if len(ctx.Query("interval")) > 0 {
-				var err error
-				ctx.Repo.Mirror.Interval, err = base.StrTo(ctx.Query("interval")).Int()
-				if err != nil {
-					log.Error("repo.SettingPost(get mirror interval): %v", err)
-				} else if err = models.UpdateMirror(ctx.Repo.Mirror); err != nil {
+			if form.Interval > 0 {
+				ctx.Repo.Mirror.Interval = form.Interval
+				if err := models.UpdateMirror(ctx.Repo.Mirror); err != nil {
 					log.Error("repo.SettingPost(UpdateMirror): %v", err)
 				}
 			}
@@ -125,11 +118,6 @@ func SettingPost(ctx *middleware.Context) {
 }
 
 func Collaboration(ctx *middleware.Context) {
-	if !ctx.Repo.IsOwner {
-		ctx.Error(404)
-		return
-	}
-
 	repoLink := strings.TrimPrefix(ctx.Repo.RepoLink, "/")
 	ctx.Data["IsRepoToolbarCollaboration"] = true
 	ctx.Data["Title"] = repoLink + " - collaboration"
@@ -166,11 +154,6 @@ func Collaboration(ctx *middleware.Context) {
 }
 
 func CollaborationPost(ctx *middleware.Context) {
-	if !ctx.Repo.IsOwner {
-		ctx.Error(404)
-		return
-	}
-
 	repoLink := strings.TrimPrefix(ctx.Repo.RepoLink, "/")
 	name := strings.ToLower(ctx.Query("collaborator"))
 	if len(name) == 0 || ctx.Repo.Owner.LowerName == name {
@@ -215,33 +198,18 @@ func CollaborationPost(ctx *middleware.Context) {
 }
 
 func WebHooks(ctx *middleware.Context) {
-	if !ctx.Repo.IsOwner {
-		ctx.Handle(404, "repo.WebHooks", nil)
-		return
-	}
-
 	ctx.Data["IsRepoToolbarWebHooks"] = true
 	ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Web Hooks"
 	ctx.HTML(200, "repo/hooks")
 }
 
 func WebHooksAdd(ctx *middleware.Context) {
-	if !ctx.Repo.IsOwner {
-		ctx.Handle(404, "repo.WebHooksAdd", nil)
-		return
-	}
-
 	ctx.Data["IsRepoToolbarWebHooks"] = true
 	ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Add Web Hook"
 	ctx.HTML(200, "repo/hooks_add")
 }
 
 func WebHooksEdit(ctx *middleware.Context) {
-	if !ctx.Repo.IsOwner {
-		ctx.Handle(404, "repo.WebHooksEdit", nil)
-		return
-	}
-
 	ctx.Data["IsRepoToolbarWebHooks"] = true
 	ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Web Hook Name"
 	ctx.HTML(200, "repo/hooks_edit")
diff --git a/routers/user/user.go b/routers/user/user.go
index 7af65fc5..e33353ab 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -217,7 +217,7 @@ func SignUpPost(ctx *middleware.Context, form auth.RegisterForm) {
 	if form.Password != form.RetypePasswd {
 		ctx.Data["Err_Password"] = true
 		ctx.Data["Err_RetypePasswd"] = true
-		ctx.RenderWithErr("Password and re-type password are not same", "user/signup", &form)
+		ctx.RenderWithErr("Password and re-type password are not same.", "user/signup", &form)
 		return
 	}