Clean repo code

2 files changed, 20 insertions, 21 deletions

diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index eafe8cb41b..96721bfdeb 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 f2e1b04730..0d60ee9a76 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
 	}