Enforce system defaults in CreateUser

Allow for overwrites with CreateUserOverwriteOptions
This commit is contained in:
Jimmy Praet
2022-04-02 12:00:35 +02:00
parent 9020faa3ce
commit 1f8710eea1
15 changed files with 139 additions and 75 deletions
+9 -6
View File
@@ -499,13 +499,16 @@ func SubmitInstall(ctx *context.Context) {
// Create admin account
if len(form.AdminName) > 0 {
u := &user_model.User{
Name: form.AdminName,
Email: form.AdminEmail,
Passwd: form.AdminPasswd,
IsAdmin: true,
IsActive: true,
Name: form.AdminName,
Email: form.AdminEmail,
Passwd: form.AdminPasswd,
IsAdmin: true,
}
if err = user_model.CreateUser(u); err != nil {
overwriteDefault := &user_model.CreateUserOverwriteOptions{
IsActive: new(bool),
}
if err = user_model.CreateUser(u, overwriteDefault); err != nil {
if !user_model.IsErrUserAlreadyExist(err) {
setting.InstallLock = false
ctx.Data["Err_AdminName"] = true