m79305216
/
gitea
forked from p85947160/gitea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIx hiding of fields in authorization source page (#10734) (#10752)

This commit is contained in:
Lauris BH 2020-03-19 17:40:01 +02:00 committed by GitHub
parent c0b917b7eb
commit e2da9cd21f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web_src/js/index.js
View File

@ -1886,18 +1886,11 @@ function initAdmin() {
$('.oauth2_use_custom_url_field input[required]').removeAttr('required'); $('.oauth2_use_custom_url_field input[required]').removeAttr('required');
if ($('#oauth2_use_custom_url').is(':checked')) { if ($('#oauth2_use_custom_url').is(':checked')) {
if (!$('#oauth2_token_url').val()) { $('#oauth2_token_url').val($(`#${provider}_token_url`).val());
$('#oauth2_token_url').val($(`#${provider}_token_url`).val()); $('#oauth2_auth_url').val($(`#${provider}_auth_url`).val());
} $('#oauth2_profile_url').val($(`#${provider}_profile_url`).val());
if (!$('#oauth2_auth_url').val()) { $('#oauth2_email_url').val($(`#${provider}_email_url`).val());
$('#oauth2_auth_url').val($(`#${provider}_auth_url`).val());
}
if (!$('#oauth2_profile_url').val()) {
$('#oauth2_profile_url').val($(`#${provider}_profile_url`).val());
}
if (!$('#oauth2_email_url').val()) {
$('#oauth2_email_url').val($(`#${provider}_email_url`).val());
}
switch (provider) { switch (provider) {
case 'github': case 'github':
$('.oauth2_token_url input, .oauth2_auth_url input, .oauth2_profile_url input, .oauth2_email_url input').attr('required', 'required'); $('.oauth2_token_url input, .oauth2_auth_url input, .oauth2_profile_url input, .oauth2_email_url input').attr('required', 'required');
@ -1916,7 +1909,7 @@ function initAdmin() {
// New authentication // New authentication
if ($('.admin.new.authentication').length > 0) { if ($('.admin.new.authentication').length > 0) {
$('#auth_type').change(function () { $('#auth_type').change(function () {
$('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls .search-page-size .sspi').hide(); $('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls, .search-page-size, .sspi').hide();
$('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required], .sspi input[required]').removeAttr('required'); $('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required], .sspi input[required]').removeAttr('required');
$('.binddnrequired').removeClass('required'); $('.binddnrequired').removeClass('required');