diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-09-24 13:02:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 13:02:49 +0800 |
| commit | 5a438ee3c0303efcb9d1935ff521917fe8a109e8 (patch) | |
| tree | 8f36452631fc8a6d077addbbf857da6d50024a0a /routers/api | |
| parent | 730065a3dc72683460b95ba1486dba8ec355a373 (diff) | |
| download | gitea-5a438ee3c0303efcb9d1935ff521917fe8a109e8.tar.gz gitea-5a438ee3c0303efcb9d1935ff521917fe8a109e8.zip | |
Move all mail related codes from models to services/mailer (#7200)
* move all mail related codes from models to modules/mailer
* fix lint
* use DBContext instead Engine
* use WithContext not WithEngine
* Use DBContext instead of Engine
* don't use defer when sess.Close()
* move DBContext to context.go and add some methods
* move mailer from modules/ to services
* fix lint
* fix tests
* fix fmt
* add gitea copyright
* fix tests
* don't expose db functions
* make code clear
* add DefaultDBContext
* fix build
* fix bug
Diffstat (limited to 'routers/api')
| -rw-r--r-- | routers/api/v1/admin/user.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index f4b694aa22..70076b626b 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -9,10 +9,10 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/routers/api/v1/convert" "code.gitea.io/gitea/routers/api/v1/user" + "code.gitea.io/gitea/services/mailer" ) func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, loginName string) { @@ -88,8 +88,8 @@ func CreateUser(ctx *context.APIContext, form api.CreateUserOption) { log.Trace("Account created by admin (%s): %s", ctx.User.Name, u.Name) // Send email notification. - if form.SendNotify && setting.MailService != nil { - models.SendRegisterNotifyMail(ctx.Context.Context, u) + if form.SendNotify { + mailer.SendRegisterNotifyMail(ctx.Locale, u) } ctx.JSON(201, convert.ToUser(u, ctx.IsSigned, ctx.User.IsAdmin)) } |