Просмотр исходного кода

Set OpenID support on by default when installing new instance (#3010)

tags/v1.4.0-rc1
Sandro Santilli 6 лет назад
Родитель
Сommit
67b0d2175d
2 измененных файлов: 3 добавлений и 3 удалений
  1. 1
    1
      modules/setting/setting.go
  2. 2
    2
      routers/install.go

+ 1
- 1
modules/setting/setting.go Просмотреть файл

@@ -1165,7 +1165,7 @@ func newService() {
Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply.example.org")

sec = Cfg.Section("openid")
Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(false)
Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(!InstallLock)
Service.EnableOpenIDSignUp = sec.Key("ENABLE_OPENID_SIGNUP").MustBool(!Service.DisableRegistration && Service.EnableOpenIDSignIn)
pats := sec.Key("WHITELISTED_URIS").Strings(" ")
if len(pats) != 0 {

+ 2
- 2
routers/install.go Просмотреть файл

@@ -108,8 +108,8 @@ func Install(ctx *context.Context) {
form.OfflineMode = setting.OfflineMode
form.DisableGravatar = setting.DisableGravatar
form.EnableFederatedAvatar = setting.EnableFederatedAvatar
form.EnableOpenIDSignIn = true
form.EnableOpenIDSignUp = true
form.EnableOpenIDSignIn = setting.Service.EnableOpenIDSignIn
form.EnableOpenIDSignUp = setting.Service.EnableOpenIDSignUp
form.DisableRegistration = setting.Service.DisableRegistration
form.EnableCaptcha = setting.Service.EnableCaptcha
form.RequireSignInView = setting.Service.RequireSignInView

Загрузка…
Отмена
Сохранить