Work on admin

2 files changed, 2 insertions, 6 deletions

diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index b67f766b..44033abb 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -39,7 +39,7 @@ func SignOutRequire() martini.Handler {
 // AdminRequire requires user signed in as administor.
 func AdminRequire() martini.Handler {
 	return func(ctx *Context) {
-		if ctx.User.LowerName != base.AdminName && !ctx.User.IsAdmin {
+		if !ctx.User.IsAdmin {
 			ctx.Error(403)
 			return
 		}
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 744cdfc1..cb3cbabc 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
-	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/log"
 )
 
@@ -112,10 +111,7 @@ func InitContext() martini.Handler {
 			ctx.Data["SignedUser"] = user
 			ctx.Data["SignedUserId"] = user.Id
 			ctx.Data["SignedUserName"] = user.LowerName
-
-			if ctx.User.IsAdmin || ctx.User.LowerName == base.AdminName {
-				ctx.Data["IsAdmin"] = true
-			}
+			ctx.Data["IsAdmin"] = ctx.User.IsAdmin
 		}
 
 		ctx.Data["PageStartTime"] = time.Now()