Small merge unmagling

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2021-12-16 14:38:04 -08:00
parent 6be98638ed
commit 398180dc59
4 changed files with 2 additions and 8 deletions

View file

@ -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(), [

View file

@ -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']);
}

View file

@ -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;

View file

@ -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) {