From 59a126c47ca8278206df196cf26926dfa187bb49 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 16 Oct 2017 05:52:18 -0700
Subject: [PATCH] Small tweaks to LDAP test

---
 app/Http/Controllers/Api/SettingsController.php |  3 ++-
 resources/views/settings/ldap.blade.php         |  9 ++-------
 routes/api.php                                  | 11 ++++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index 00bb8bf40..5c987584b 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -75,8 +75,9 @@ class SettingsController extends Controller
         //
     }
 
-    public function getLdapTest()
+    public function ldaptest()
     {
+        echo 'foo';
         \Log::debug('Preparing to test LDAP connection');
 
         try {
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 84f046a3c..d114fcfbe 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -335,13 +335,11 @@
                             </div>
                             <div class="col-md-9">
                                 <div id="ldaptestrow">
-                                    <div class="col-md-8">
                                         <a class="btn btn-default btn-sm pull-left" id="ldaptest" style="margin-right: 10px;"> Test LDAP</a>
                                         <span id="ldaptesticon"></span>
                                         <span id="ldaptestresult"></span>
                                         <span id="ldapteststatus"></span>
                                     </div>
-                                </div>
                             </div>
                         </div>
 
@@ -389,20 +387,17 @@
                 dataType: 'json',
 
                 success: function (data) {
-                    // console.dir(data);
-                    //console.log(data.responseJSON.message);
                     $("#ldaptesticon").html('');
                     $("#ldaptestrow").addClass('success');
                     $("#ldapteststatus").html('<i class="fa fa-check text-success"></i> It worked!');
                 },
 
                 error: function (data) {
-                    console.dir(data);
-                    console.log(data.responseJSON.message);
+                    //console.dir(data);
                     $("#ldaptesticon").html('');
                     $("#ldaptestrow").addClass('danger');
                     $("#ldaptesticon").html('<i class="fa fa-exclamation-triangle text-danger"></i>');
-                    $('#ldapteststatus').text(data.responseJSON.message);
+                    $('#ldapteststatus').text(data.responseText.message);
                 }
 
 
diff --git a/routes/api.php b/routes/api.php
index 6cdf782b4..fa31edde4 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -419,7 +419,11 @@ Route::group(['prefix' => 'v1','namespace' => 'Api'], function () {
 
 
     /*--- Settings API ---*/
-
+    Route::get('settings/ldaptest', [
+        'as' => 'api.settings.ldaptest',
+        'uses' => 'SettingsController@ldaptest'
+    ]);
+    
     Route::resource('settings', 'SettingsController',
         [
             'names' =>
@@ -434,10 +438,7 @@ Route::group(['prefix' => 'v1','namespace' => 'Api'], function () {
         ]
     ); // Settings resource
 
-    Route::get('settings/ldaptest', [
-        'as' => 'api.settings.ldaptest',
-        'uses' => 'SettingsController@getLdapTest'
-    ]);
+
 
 
     /*--- Status Labels API ---*/