diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index 1912cf2e1..c821253e1 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 feba60757..d2e580d4f 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 b3a1a7367..28c56dabf 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 21d770056..9f3a3a039 100644 --- a/resources/views/settings/slack.blade.php +++ b/resources/views/settings/slack.blade.php @@ -166,7 +166,7 @@ $("#slackteststatus").html(''); $("#slacktesticon").html(' 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) {