Use 'Enable' for OpenID registration

Author: strk

modules/auth/user_form.go

@@ -42,7 +42,7 @@ type InstallForm struct {
 	DisableGravatar                bool
 	EnableFederatedAvatar          bool
 	EnableOpenIDSignIn             bool
-	DisableOpenIDRegistration      bool
+	EnableOpenIDSignUp             bool
 	DisableRegistration            bool
 	EnableCaptcha                  bool
 	RequireSignInView              bool

options/locale/locale_en-US.ini

@@ -118,8 +118,8 @@ disable_registration = Disable Self-registration
 disable_registration_popup = Disable user self-registration, only admin can create accounts.
 openid_signin = Enable OpenID Sign-In
 openid_signin_popup = Enable user login via OpenID
-disable_openid_registration = Disable OpenID Self-registration
-disable_openid_registration_popup = Disable OpenID based Self-registration
+openid_signup = Enable OpenID Self-registration
+openid_signup_popup = Enable OpenID based Self-registration
 enable_captcha = Enable Captcha
 enable_captcha_popup = Require a CAPTCHA for user self-registration.
 require_sign_in_view = Enable Require Sign In to View Pages

public/js/index.js

@@ -311,12 +311,22 @@ function initInstall() {
             $('#offline-mode').checkbox('uncheck');
         }
     });
+    $('#enable-openid-signin input').change(function () {
+        if ($(this).is(':checked')) {
+            if ( $('#disable-registration input').is(':checked') ) {
+            } else {
+                $('#enable-openid-signup').checkbox('check');
+            }
+        } else {
+            $('#enable-openid-signup').checkbox('uncheck');
+        }
+    });
     $('#disable-registration input').change(function () {
         if ($(this).is(':checked')) {
             $('#enable-captcha').checkbox('uncheck');
-            $('#disable-openid-registration').checkbox('check');
+            $('#enable-openid-signup').checkbox('uncheck');
         } else {
-            $('#disable-openid-registration').checkbox('uncheck');
+            $('#enable-openid-signup').checkbox('check');
         }
     });
     $('#enable-captcha input').change(function () {

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 // setting.Service.EnableOpenIDSignIn
-	form.DisableOpenIDRegistration = !setting.Service.EnableOpenIDSignUp
+	form.EnableOpenIDSignIn = true
+	form.EnableOpenIDSignUp = true
 	form.DisableRegistration = setting.Service.DisableRegistration
 	form.EnableCaptcha = setting.Service.EnableCaptcha
 	form.RequireSignInView = setting.Service.RequireSignInView
@@ -295,7 +295,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
 	cfg.Section("picture").Key("DISABLE_GRAVATAR").SetValue(com.ToStr(form.DisableGravatar))
 	cfg.Section("picture").Key("ENABLE_FEDERATED_AVATAR").SetValue(com.ToStr(form.EnableFederatedAvatar))
 	cfg.Section("openid").Key("ENABLE_OPENID_SIGNIN").SetValue(com.ToStr(form.EnableOpenIDSignIn))
-	cfg.Section("openid").Key("ENABLE_OPENID_SIGNUP").SetValue(com.ToStr(!form.DisableOpenIDRegistration))
+	cfg.Section("openid").Key("ENABLE_OPENID_SIGNUP").SetValue(com.ToStr(form.EnableOpenIDSignUp))
 	cfg.Section("service").Key("DISABLE_REGISTRATION").SetValue(com.ToStr(form.DisableRegistration))
 	cfg.Section("service").Key("ENABLE_CAPTCHA").SetValue(com.ToStr(form.EnableCaptcha))
 	cfg.Section("service").Key("REQUIRE_SIGNIN_VIEW").SetValue(com.ToStr(form.RequireSignInView))

templates/install.tmpl

@@ -189,7 +189,7 @@
 								</div>
 							</div>
 							<div class="inline field">
-								<div class="ui checkbox" id="openid-signin">
+								<div class="ui checkbox" id="enable-openid-signin">
 									<label class="poping up" data-content="{{.i18n.Tr "install.openid_signin_popup"}}"><strong>{{.i18n.Tr "install.openid_signin"}}</strong></label>
 									<input name="enable_open_id_sign_in" type="checkbox" {{if .enable_open_id_sign_in}}checked{{end}}>
 								</div>
@@ -201,9 +201,9 @@
 								</div>
 							</div>
 							<div class="inline field">
-								<div class="ui checkbox" id="disable-openid-registration">
-									<label class="poping up" data-content="{{.i18n.Tr "install.disable_openid_registration_popup"}}"><strong>{{.i18n.Tr "install.disable_openid_registration"}}</strong></label>
-									<input name="disable_open_id_registration" type="checkbox" {{if .disable_open_id_registration}}checked{{end}}>
+								<div class="ui checkbox" id="enable-openid-signup">
+									<label class="poping up" data-content="{{.i18n.Tr "install.openid_signup_popup"}}"><strong>{{.i18n.Tr "install.openid_signup"}}</strong></label>
+									<input name="enable_open_id_sign_up" type="checkbox" {{if .enable_open_id_sign_up}}checked{{end}}>
 								</div>
 							</div>
 							<div class="inline field">