From 5acc948562547b393ba1e89b012e7421143c6dd8 Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Thu, 14 Aug 2014 14:12:21 +0800
Subject: Page: `/org/:orgname/settings`

---
 modules/middleware/repo.go | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'modules/middleware/repo.go')

diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 929850d2..a028aab8 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -20,15 +20,13 @@ import (
 
 func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
 	return func(ctx *Context) {
-		// To valid brach name.
-		var validBranch bool
-		// To display bare quick start if it is a bare repo.
-		var displayBare bool
-
+		var (
+			validBranch bool // To valid brach name.
+			displayBare bool // To display bare page if it is a bare repo.
+		)
 		if len(args) >= 1 {
 			validBranch = args[0]
 		}
-
 		if len(args) >= 2 {
 			displayBare = args[1]
 		}
@@ -60,12 +58,11 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
 			if err != nil {
 				if err == models.ErrUserNotExist {
 					ctx.Handle(404, "GetUserByName", err)
-					return
 				} else if redirect {
 					ctx.Redirect("/")
-					return
+				} else {
+					ctx.Handle(500, "GetUserByName", err)
 				}
-				ctx.Handle(500, "GetUserByName", err)
 				return
 			}
 		} else {
-- 
cgit v1.2.3