Merge branch 'develop' into 5.8-dev

And fix rule creation and edit etc
This commit is contained in:
James Cole
2022-10-01 07:34:30 +02:00
10 changed files with 35 additions and 18 deletions

View File

@@ -66,11 +66,14 @@ class RuleFormRequest extends FormRequest
if (is_array($triggerData)) {
foreach ($triggerData as $trigger) {
$stopProcessing = $trigger['stop_processing'] ?? '0';
$return[] = [
$prohibited = $trigger['prohibited'] ?? '0';
$set = [
'type' => $trigger['type'] ?? 'invalid',
'value' => $trigger['value'] ?? '',
'stop_processing' => 1 === (int) $stopProcessing,
'prohibited' => 1 === (int) $prohibited,
];
$return[] = $set;
}
}