From 398180dc59f611b94ee60e00b785786660b4d5a4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 16 Dec 2021 14:38:04 -0800
Subject: [PATCH] Small merge unmagling

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/SettingsController.php | 3 +--
 app/Http/Controllers/CustomFieldsController.php | 4 ----
 app/Http/Controllers/SettingsController.php     | 1 -
 resources/views/settings/slack.blade.php        | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
index 1912cf2e1d..c821253e19 100644
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -17,7 +17,6 @@ use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator; 
-use App\Models\Ldap; // forward-port of v4 LDAP model for Sync
 use App\Http\Requests\SlackSettingsRequest;
 
 
@@ -166,7 +165,7 @@ class SettingsController extends Controller
         }
     }
 
-    public function slacktest(Request $request)
+    public function slacktest(SlackSettingsRequest $request)
     {
 
         $validator = Validator::make($request->all(), [
diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index feba607575..d2e580d4f7 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -153,10 +153,6 @@ class CustomFieldsController extends Controller
                 ->with("success", trans('admin/custom_fields/message.field.delete.success'));
         }
 
-            return redirect()->route('fields.index')
-                ->with('success', trans('admin/custom_fields/message.field.delete.success'));
-        }
-
         return redirect()->back()->withErrors(['message' => 'Field does not exist']);
     }
 
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index b3a1a7367c..28c56dabff 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -21,7 +21,6 @@ use Image;
 use Input;
 use Redirect;
 use Response;
-use App\Helpers\StorageHelper;
 use App\Http\Requests\SlackSettingsRequest;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Artisan;
diff --git a/resources/views/settings/slack.blade.php b/resources/views/settings/slack.blade.php
index 21d7700561..9f3a3a039f 100644
--- a/resources/views/settings/slack.blade.php
+++ b/resources/views/settings/slack.blade.php
@@ -166,7 +166,7 @@
             $("#slackteststatus").html('');
             $("#slacktesticon").html('<i class="fas fa-spinner spin"></i> Sending Slack test message...');
             $.ajax({
-                {
+                
                 // If I comment this back in, I always get a success (200) message
                 // Without it, I get 
                     //  beforeSend: function (xhr) {