mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 23:33:15 -05:00
fix(services): set SendNotificationEmailOnNewUser
regression from767e9634d3
. It changed the parsing of the [admin] section from being derived from the content of each key with mustMapSetting(rootCfg, "admin", &Admin) to explicitly listing all keys in the code. SEND_NOTIFICATION_EMAIL_ON_NEW_USER was not added and therefore ignored. As a consequence notifications of newly registered users were never sent. (cherry picked from commitff2a3f4e3a
) Conflict: modules/setting/admin_test.go EXTERNAL_USER_DISABLE_FEATURES does not exist in v7.0
This commit is contained in:
parent
60ee476b57
commit
a215e9db30
3 changed files with 32 additions and 0 deletions
|
@ -17,6 +17,7 @@ func loadAdminFrom(rootCfg ConfigProvider) {
|
||||||
sec := rootCfg.Section("admin")
|
sec := rootCfg.Section("admin")
|
||||||
Admin.DisableRegularOrgCreation = sec.Key("DISABLE_REGULAR_ORG_CREATION").MustBool(false)
|
Admin.DisableRegularOrgCreation = sec.Key("DISABLE_REGULAR_ORG_CREATION").MustBool(false)
|
||||||
Admin.DefaultEmailNotification = sec.Key("DEFAULT_EMAIL_NOTIFICATIONS").MustString("enabled")
|
Admin.DefaultEmailNotification = sec.Key("DEFAULT_EMAIL_NOTIFICATIONS").MustString("enabled")
|
||||||
|
Admin.SendNotificationEmailOnNewUser = sec.Key("SEND_NOTIFICATION_EMAIL_ON_NEW_USER").MustBool(false)
|
||||||
Admin.UserDisabledFeatures = container.SetOf(sec.Key("USER_DISABLED_FEATURES").Strings(",")...)
|
Admin.UserDisabledFeatures = container.SetOf(sec.Key("USER_DISABLED_FEATURES").Strings(",")...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
30
modules/setting/admin_test.go
Normal file
30
modules/setting/admin_test.go
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
// Copyright The Forgejo Authors.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package setting
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/container"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_loadAdminFrom(t *testing.T) {
|
||||||
|
iniStr := `
|
||||||
|
[admin]
|
||||||
|
DISABLE_REGULAR_ORG_CREATION = true
|
||||||
|
DEFAULT_EMAIL_NOTIFICATIONS = z
|
||||||
|
SEND_NOTIFICATION_EMAIL_ON_NEW_USER = true
|
||||||
|
USER_DISABLED_FEATURES = a,b
|
||||||
|
`
|
||||||
|
cfg, err := NewConfigProviderFromData(iniStr)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
loadAdminFrom(cfg)
|
||||||
|
|
||||||
|
assert.EqualValues(t, true, Admin.DisableRegularOrgCreation)
|
||||||
|
assert.EqualValues(t, "z", Admin.DefaultEmailNotification)
|
||||||
|
assert.EqualValues(t, true, Admin.SendNotificationEmailOnNewUser)
|
||||||
|
assert.EqualValues(t, container.SetOf("a", "b"), Admin.UserDisabledFeatures)
|
||||||
|
}
|
1
release-notes/8.0.0/fix/3904.md
Normal file
1
release-notes/8.0.0/fix/3904.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
- a v7.0.0 regression causing `[admin].SEND_NOTIFICATION_EMAIL_ON_NEW_USER=true` to always be ignored.
|
Loading…
Reference in a new issue