Work on admin
This commit is contained in:
parent
9f9cd6bfc6
commit
4cf6cc63b0
6 changed files with 10 additions and 14 deletions
|
@ -27,10 +27,6 @@ PASSWD =
|
|||
; For "postgres" only, either "disable", "require" or "verify-full"
|
||||
SSL_MODE = disable
|
||||
|
||||
[admin]
|
||||
; Administor's name, which should be same as the user name you want to authorize
|
||||
NAME = admin
|
||||
|
||||
[security]
|
||||
; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!!
|
||||
SECRET_KEY = !#@FDEWREWR&*(
|
||||
|
|
|
@ -137,7 +137,13 @@ func RegisterUser(user *User) (*User, error) {
|
|||
}
|
||||
return nil, err
|
||||
}
|
||||
return user, nil
|
||||
|
||||
if user.Id == 1 {
|
||||
user.IsAdmin = true
|
||||
user.IsActive = true
|
||||
_, err = orm.Id(user.Id).UseBool().Update(user)
|
||||
}
|
||||
return user, err
|
||||
}
|
||||
|
||||
// get user by erify code
|
||||
|
|
|
@ -32,7 +32,6 @@ var (
|
|||
AppUrl string
|
||||
Domain string
|
||||
SecretKey string
|
||||
AdminName string
|
||||
Cfg *goconfig.ConfigFile
|
||||
MailService *Mailer
|
||||
)
|
||||
|
@ -174,7 +173,6 @@ func init() {
|
|||
AppUrl = Cfg.MustValue("server", "ROOT_URL")
|
||||
Domain = Cfg.MustValue("server", "DOMAIN")
|
||||
SecretKey = Cfg.MustValue("security", "SECRET_KEY")
|
||||
AdminName = strings.ToLower(Cfg.MustValue("admin", "NAME"))
|
||||
}
|
||||
|
||||
func NewServices() {
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -153,7 +153,7 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
|
|||
log.Trace("%s User created: %s", ctx.Req.RequestURI, strings.ToLower(form.UserName))
|
||||
|
||||
// Send confirmation e-mail.
|
||||
if base.Service.RegisterEmailConfirm {
|
||||
if base.Service.RegisterEmailConfirm && u.Id > 1 {
|
||||
mailer.SendRegisterMail(ctx.Render, u)
|
||||
ctx.Data["IsSendRegisterMail"] = true
|
||||
ctx.Data["Email"] = u.Email
|
||||
|
|
Reference in a new issue