kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 14:46:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/8057

Browse Source
This commit is contained in:
James Cole
2023-10-15 12:45:27 +02:00
parent 127b6ea515
commit 028ef63f6e
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Rule/CreateController.php
View File

@@ -98,7 +98,9 @@ class CreateController extends Controller
$operators = $search->getOperators()->toArray();
if ('' !== $words) {
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => $words]));
$operators[] = ['type' => 'description_contains', 'value' => $words];
$operators[] = [
'type' => 'description_contains',
'value' => $words];
}
$oldTriggers = $this->parseFromOperators($operators);
}

11
app/Support/Http/Controllers/RuleManagement.php
View File

@@ -143,11 +143,12 @@ trait RuleManagement
$renderedEntries[] = view(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
'oldValue' => $operator['value'],
'oldChecked' => false,
'count' => $index + 1,
'triggers' => $triggers,
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
'oldValue' => $operator['value'],
'oldChecked' => false,
'oldProhibited' => $operator['prohibited'] ?? false,
'count' => $index + 1,
'triggers' => $triggers,
]
)->render();
} catch (Throwable $e) {