:100644 100644 0d6e4bf00 000000000 M app/Http/Controllers/Select/AlertRuleController.php :100644 100644 a57fd7b1c 000000000 M app/Http/Requests/AlertTemplateRequest.php diff --git a/app/Http/Controllers/Select/AlertRuleController.php b/app/Http/Controllers/Select/AlertRuleController.php index 0d6e4bf00d3242483bd65fe37ce820c849c8ff7f..202102bd4f0f63d0d5fda7681b8c19baf6d5c2e5 100644 --- a/app/Http/Controllers/Select/AlertRuleController.php +++ b/app/Http/Controllers/Select/AlertRuleController.php @@ -1,4 +1,5 @@ $model->id, + 'id' => $model->id, 'text' => $model->name, ]; } diff --git a/app/Http/Requests/AlertTemplateRequest.php b/app/Http/Requests/AlertTemplateRequest.php index a57fd7b1c902eee6e00da8cedac24fa8df1bae29..839418c0a9b1e01b75835ef113e723424ba80997 100644 --- a/app/Http/Requests/AlertTemplateRequest.php +++ b/app/Http/Requests/AlertTemplateRequest.php @@ -88,13 +88,12 @@ class AlertTemplateRequest extends FormRequest $test_data['alert'] = new AlertData(AlertData::testData($test_device)); foreach ($fields as $fieldName => $templateString) { - if (empty($templateString) || !is_string($templateString)) { + if (empty($templateString) || ! is_string($templateString)) { continue; } try { Blade::render($templateString, $test_data, true); // unsafe - } catch (\Throwable $e) { $v->errors()->add($fieldName, "The $fieldName field has invalid template syntax: " . $e->getMessage()); }