IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7317

Browse Source
This commit is contained in:
James Cole 2023-04-02 19:42:06 +02:00
parent 2e32acc3c9
commit 6fbf4ec6f1
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Rule/SelectController.php
View File

@ -38,8 +38,8 @@ use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\View\View;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use Throwable; use Throwable;
/** /**
@ -150,9 +150,13 @@ class SelectController extends Controller
} }
foreach ($textTriggers as $textTrigger) { foreach ($textTriggers as $textTrigger) {
$trigger = new RuleTrigger(); $trigger = new RuleTrigger();
$trigger->trigger_type = $textTrigger['type']; $trigger->trigger_type = $textTrigger['type'];
$trigger->trigger_value = $textTrigger['value']; $trigger->trigger_value = $textTrigger['value'];
$trigger->stop_processing = $textTrigger['stop_processing'];
if ($textTrigger['prohibited']) {
$trigger->trigger_type = sprintf('-%s', $textTrigger['type']);
}
$triggers->push($trigger); $triggers->push($trigger);
} }

3
app/Support/Http/Controllers/RequestInformation.php
View File

@ -33,9 +33,9 @@ use FireflyIII\User;
use Hash; use Hash;
use Illuminate\Contracts\Validation\Validator as ValidatorContract; use Illuminate\Contracts\Validation\Validator as ValidatorContract;
use Illuminate\Routing\Route; use Illuminate\Routing\Route;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use InvalidArgumentException; use InvalidArgumentException;
use Illuminate\Support\Facades\Log;
use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface; use Psr\Container\NotFoundExceptionInterface;
use Route as RouteFacade; use Route as RouteFacade;
@ -75,6 +75,7 @@ trait RequestInformation
$current = [ $current = [
'type' => $triggerInfo['type'] ?? '', 'type' => $triggerInfo['type'] ?? '',
'value' => $triggerInfo['value'] ?? '', 'value' => $triggerInfo['value'] ?? '',
'prohibited' => $triggerInfo['prohibited'] ?? false,
'stop_processing' => 1 === (int)($triggerInfo['stop_processing'] ?? '0'), 'stop_processing' => 1 === (int)($triggerInfo['stop_processing'] ?? '0'),
]; ];
$current = RuleFormRequest::replaceAmountTrigger($current); $current = RuleFormRequest::replaceAmountTrigger($current);