From 206bd675f27b650809d50a0083ead2187c2a4412 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 8 Apr 2020 15:07:02 -0700 Subject: [PATCH] =?UTF-8?q?Pulled=20slack=20validation=20out=20of=20settin?= =?UTF-8?q?g=20model=20validation=20so=20it=20doesn=E2=80=99t=20fail=20mys?= =?UTF-8?q?teriously=20on=20other=20pages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/SettingsController.php | 18 ++++++++++++++---- app/Models/Setting.php | 3 --- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 7eecd5476..4aa574a6d 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -645,14 +645,24 @@ class SettingsController extends Controller return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - $setting->slack_endpoint = $request->input('slack_endpoint'); - $setting->slack_channel = $request->input('slack_channel'); - $setting->slack_botname = $request->input('slack_botname'); + $validatedData = $request->validate([ + 'slack_endpoint' => 'url|required_with:slack_channel|nullable', + 'slack_channel' => 'regex:/(? 'string|nullable', + ]); - if ($setting->save()) { + if ($validatedData) { + + $setting->slack_endpoint = $request->input('slack_endpoint'); + $setting->slack_channel = $request->input('slack_channel'); + $setting->slack_botname = $request->input('slack_botname'); + + $setting->save(); return redirect()->route('settings.index') ->with('success', trans('admin/settings/message.update.success')); + } + return redirect()->back()->withInput()->withErrors($setting->getErrors()); } diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 57f97a95c..4212b1618 100755 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -20,9 +20,6 @@ class Setting extends Model 'admin_cc_email' => 'email|nullable', 'default_currency' => 'required', 'locale' => 'required', - 'slack_endpoint' => 'url|required_with:slack_channel|nullable', - 'slack_channel' => 'regex:/(? 'string|nullable', 'labels_per_page' => 'numeric|min:1', 'labels_width' => 'numeric', 'labels_height' => 'numeric',