kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-23 12:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
And fix rule creation and edit etc
This commit is contained in:
James Cole
2022-10-01 07:34:30 +02:00
parent 5714bd0749 5c471059f3
commit 9bfa52f3ce
10 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Support/Http/Controllers/RenderPartialViews.php
View File

@@ -317,14 +317,19 @@ trait RenderPartialViews
if ('user_action' !== $entry->trigger_type) {
$count = ($index + 1);
try {
$rootOperator = OperatorQuerySearch::getRootOperator($entry->trigger_type);
if(str_starts_with($rootOperator, '-')) {
$rootOperator = substr($rootOperator, 1);
}
$renderedEntries[] = view(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($entry->trigger_type),
'oldValue' => $entry->trigger_value,
'oldChecked' => $entry->stop_processing,
'count' => $count,
'triggers' => $triggers,
'oldTrigger' => $rootOperator,
'oldValue' => $entry->trigger_value,
'oldChecked' => $entry->stop_processing,
'oldProhibited' => str_starts_with($entry->trigger_type, '-'),
'count' => $count,
'triggers' => $triggers,
]
)->render();

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

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