DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 00:54:07 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-16 10:10:29 -07:00
parent 1743417ec9 f64382aa00
commit 0f0a61e477
1 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
resources/views/settings/ldap.blade.php
View file

@ -409,7 +409,7 @@
$("#ldaptestrow").removeClass('text-success'); $("#ldaptestrow").removeClass('text-success');
$("#ldaptestrow").removeClass('text-danger'); $("#ldaptestrow").removeClass('text-danger');
$("#ldapteststatus").html(''); $("#ldapteststatus").html('');
$("#ldaptesticon").html('<i class="fa fa-spinner spin"></i> Testing...'); $("#ldaptesticon").html('<i class="fa fa-spinner spin"></i> Testing LDAP Binding...');
$.ajax({ $.ajax({
url: '{{ route('api.settings.ldaptest') }}', url: '{{ route('api.settings.ldaptest') }}',
type: 'GET', type: 'GET',
@ -423,11 +423,20 @@
success: function (data) { success: function (data) {
$("#ldaptesticon").html(''); $("#ldaptesticon").html('');
$("#ldapteststatus").addClass('text-success'); $("#ldapteststatus").addClass('text-success');
$("#ldapteststatus").html('<i class="fa fa-check text-success"></i> It worked!'); $("#ldapteststatus").html('<i class="fa fa-check text-success"></i> Connection to LDAP server established!');
}, },
error: function (data) { error: function (data) {
//console.dir(data);
if (data.responseJSON) {
var bind_errors = data.responseJSON.message;
} else {
var bind_errors;
}
var bind_error_text;
$("#ldaptesticon").html(''); $("#ldaptesticon").html('');
$("#ldapteststatus").addClass('text-danger'); $("#ldapteststatus").addClass('text-danger');
$("#ldaptesticon").html('<i class="fa fa-exclamation-triangle text-danger"></i>'); $("#ldaptesticon").html('<i class="fa fa-exclamation-triangle text-danger"></i>');
@ -436,13 +445,19 @@
$('#ldapteststatus').html('500 Server Error'); $('#ldapteststatus').html('500 Server Error');
} else if (data.status == 400) { } else if (data.status == 400) {
for (i = 0; i < errors.length; i++) { if (typeof bind_errors !='string') {
if (errors[i]) {
error_text += '<li>Error: ' + errors[i]; for (i = 0; i < bind_errors.length; i++) {
if (bind_errors[i]) {
bind_error_text += '<li>Error: ' + bind_errors[i];
}
} }
} else {
error_text = bind_errors;
} }
$('#ldapteststatus').html(error_text); $('#ldapteststatus').html(bind_error_text);
} else { } else {
$('#ldapteststatus').html(data.responseText.message); $('#ldapteststatus').html(data.responseText.message);
} }
@ -457,7 +472,7 @@
$("#ldaptestloginrow").removeClass('text-danger'); $("#ldaptestloginrow").removeClass('text-danger');
$("#ldaptestloginstatus").removeClass('text-danger'); $("#ldaptestloginstatus").removeClass('text-danger');
$("#ldaptestloginstatus").html(''); $("#ldaptestloginstatus").html('');
$("#ldaptestloginicon").html('<i class="fa fa-spinner spin"></i> Testing...'); $("#ldaptestloginicon").html('<i class="fa fa-spinner spin"></i> Testing LDAP Authentication...');
$.ajax({ $.ajax({
url: '{{ route('api.settings.ldaptestlogin') }}', url: '{{ route('api.settings.ldaptestlogin') }}',
type: 'POST', type: 'POST',
@ -475,7 +490,8 @@
success: function (data) { success: function (data) {
$("#ldaptestloginicon").html(''); $("#ldaptestloginicon").html('');
$("#ldaptestloginrow").addClass('text-success'); $("#ldaptestloginrow").addClass('text-success');
$("#ldaptestloginstatus").html('<i class="fa fa-check text-success"></i> It worked!'); $("#ldaptestloginstatus").addClass('text-success');
$("#ldaptestloginstatus").html('<i class="fa fa-check text-success"></i> User authenticated against LDAP successfully!');
}, },
error: function (data) { error: function (data) {
@ -486,7 +502,7 @@
var errors; var errors;
} }
var error_text; var error_text = '';
$("#ldaptestloginicon").html(''); $("#ldaptestloginicon").html('');
$("#ldaptestloginstatus").addClass('text-danger'); $("#ldaptestloginstatus").addClass('text-danger');
@ -496,13 +512,21 @@
$('#ldaptestloginstatus').html('500 Server Error'); $('#ldaptestloginstatus').html('500 Server Error');
} else if (data.status == 400) { } else if (data.status == 400) {
for (i = 0; i < errors.length; i++) { if (typeof errors !='string') {
if (errors[i]) {
error_text += '<li>Error: ' + errors[i]; for (i = 0; i < errors.length; i++) {
if (errors[i]) {
error_text += '<li>Error: ' + errors[i];
}
} }
} else {
error_text = errors;
} }
$('#ldaptestloginstatus').html(error_text); $('#ldaptestloginstatus').html(error_text);
} else { } else {
$('#ldaptestloginstatus').html(data.responseText.message); $('#ldaptestloginstatus').html(data.responseText.message);
} }
@ -517,4 +541,5 @@
</script> </script>
@stop @stop