kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +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

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

@@ -261,6 +261,7 @@ class CreateController extends Controller
public function store(RuleFormRequest $request)
{
$data = $request->getRuleData();
$rule = $this->ruleRepos->store($data);
session()->flash('success', (string) trans('firefly.stored_new_rule', ['title' => $rule->title]));
app('preferences')->mark();

3
app/Http/Controllers/Rule/EditController.php
View File

@@ -189,7 +189,8 @@ class EditController extends Controller
public function update(RuleFormRequest $request, Rule $rule)
{
$data = $request->getRuleData();
$this->ruleRepos->update($rule, $data);
//$this->ruleRepos->update($rule, $data);
session()->flash('success', (string) trans('firefly.updated_rule', ['title' => $rule->title]));
app('preferences')->mark();

5
app/Http/Requests/RuleFormRequest.php
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;
}
}