kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-28 00:09:56 -07:00
Code Issues Projects Releases Wiki Activity

Correct for missing variables.

Browse Source
This commit is contained in:
James Cole
2026-07-10 08:35:19 +02:00
parent 011475f4c4
commit 0cd2a582b3
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Rule/CreateController.php
+2
View File
@@ -196,6 +196,7 @@ final class CreateController extends Controller
'preFilled' => $preFilled,
'oldActions' => $oldActions,
'triggerCount' => $triggerCount,
'ruleGroup' => null,
'actionCount' => $actionCount,
'subTitle' => $subTitle,
]);
@@ -248,6 +249,7 @@ final class CreateController extends Controller
'preFilled' => $preFilled,
'oldActions' => $oldActions,
'triggerCount' => $triggerCount,
'ruleGroup' => null,
'actionCount' => $actionCount,
'subTitle' => $subTitle,
]);
app/Http/Controllers/Rule/EditController.php
+1
View File
@@ -201,6 +201,7 @@ final class EditController extends Controller
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
'oldValue' => $operator['value'],
'oldChecked' => false,
'oldProhibited' => null,
'count' => $index + 1,
'triggers' => $triggers,
])->render();
app/Support/Http/Controllers/ModelInformation.php
+2
View File
@@ -129,6 +129,7 @@ trait ModelInformation
$string = view('rules.partials.trigger', [
'oldTrigger' => $trigger,
'oldValue' => $values[$index],
'oldProhibited' => null,
'oldChecked' => false,
'count' => $index + 1,
'triggers' => $triggers,
@@ -244,6 +245,7 @@ trait ModelInformation
$renderInfo = [
'oldTrigger' => $trigger,
'oldValue' => $values[$ii],
'oldProhibited' => null,
'oldChecked' => false,
'count' => $ii + 1,
'triggers' => $triggers,
resources/views/rules/rule/create.blade.php
+5 -5
View File
@@ -3,7 +3,7 @@
<form method="POST" action="{{ route('rules.store') }}" accept-charset="UTF-8" class="form-horizontal" id="store">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<input type="hidden" name="rule_group_id" value="{{ $ruleGroup->id }}"/>
<input type="hidden" name="rule_group_id" value="{{ $ruleGroup?->id }}"/>
<input type="hidden" name="return_to_bill" value="@if($returnToBill??false)true @else false @endif"/>
<input type="hidden" name="bill_id" value="@if(null !== ($bill??null)){{ $bill->id }} @else 0 @endif"/>
@@ -11,7 +11,7 @@
@if(null !== ($bill??null))
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-success" id="mandatory">
<div class="card mb-2" id="mandatory">
<div class="card-header">
<h3 class="card-title">{{ trans('firefly.create_rule_for_bill', ['name' => $bill->name]) }}</h3>
</div>
@@ -26,14 +26,14 @@
@endif
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary" id="mandatory">
<div class="card mb-2" id="mandatory">
<div class="card-header">
<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3>
</div>
<div class="card-body">
{!! ExpandedForm::text('title') !!}
{!! ExpandedForm::select('trigger', all_journal_triggers()) !!}
{!! RuleForm::ruleGroupList('rule_group_id', $ruleGroup->id) !!}
{!! RuleForm::ruleGroupList('rule_group_id', $ruleGroup?->id) !!}
{!! ExpandedForm::checkbox('stop_processing',1, null, ['helpText' => trans('firefly.rule_help_stop_processing')]) !!}
{!! ExpandedForm::checkbox('strict',1, null,['helpText' => trans('firefly.rule_help_strict')]) !!}
</div>
@@ -59,7 +59,7 @@
<div class="card-header">
<h3 class="card-title">{{ __('firefly.rule_triggers') }}</h3>
</div>
<div class="card-body rule-trigger-box">
<div class="card-body rule-trigger-box p-0">
<table class="table table-sm table-bordered table-striped">
<thead>
<tr>
resources/views/rules/rule/edit.blade.php
+1 -1
View File
@@ -42,7 +42,7 @@
<div class="card-header">
<h3 class="card-title">{{ __('firefly.rule_triggers') }}</h3>
</div>
<div class="card -body rule-trigger-box">
<div class="card-body p-0 rule-trigger-box">
<table class="table table-sm table-bordered table-striped">
<thead>
<tr>