mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-16 18:25:00 -06:00
Some bug fixes.
This commit is contained in:
James Cole
parent
c25f5598f1
commit
d03ca0ec36
@ -192,7 +192,7 @@ class EditController extends Controller
|
||||
[
|
||||
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
|
||||
'oldValue' => $operator['value'],
|
||||
'oldChecked' => 1 === (int) ($oldTrigger['stop_processing'] ?? '0'),
|
||||
'oldChecked' => false,
|
||||
'count' => $index + 1,
|
||||
'triggers' => $triggers,
|
||||
]
|
||||
|
||||
@ -62,7 +62,7 @@ trait RuleManagement
|
||||
[
|
||||
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
|
||||
'oldValue' => $operator['value'],
|
||||
'oldChecked' => 1 === (int) ($oldTrigger['stop_processing'] ?? '0'),
|
||||
'oldChecked' => false,
|
||||
'count' => $index + 1,
|
||||
'triggers' => $triggers,
|
||||
]
|
||||
|
||||
@ -52,12 +52,12 @@
|
||||
<table class="table table-sm table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th> </th>
|
||||
<th>{{ $t('list.name') }}</th>
|
||||
<th v-if="'asset' === $props.accountTypes">{{ $t('list.role') }}</th>
|
||||
<th>{{ $t('list.iban') }}</th>
|
||||
<th style="text-align: right;">{{ $t('list.currentBalance') }}</th>
|
||||
<th>{{ $t('list.balanceDiff') }}</th>
|
||||
<th scope="col"> </th>
|
||||
<th scope="col">{{ $t('list.name') }}</th>
|
||||
<th scope="col" v-if="'asset' === $props.accountTypes">{{ $t('list.role') }}</th>
|
||||
<th scope="col">{{ $t('list.iban') }}</th>
|
||||
<th scope="col" style="text-align: right;">{{ $t('list.currentBalance') }}</th>
|
||||
<th scope="col">{{ $t('list.balanceDiff') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -27,9 +27,9 @@
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:35%;">{{ $t('list.name') }}</th>
|
||||
<th style="width:40%;">{{ $t('list.amount') }}</th>
|
||||
<th style="width:25%;">{{ $t('list.next_expected_match') }}</th>
|
||||
<th scope="col" style="width:35%;">{{ $t('list.name') }}</th>
|
||||
<th scope="col" style="width:40%;">{{ $t('list.amount') }}</th>
|
||||
<th scope="col" style="width:25%;">{{ $t('list.next_expected_match') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -27,9 +27,9 @@
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:35%;">{{ $t('list.piggy_bank') }}</th>
|
||||
<th style="width:40%;">{{ $t('list.percentage') }}</th>
|
||||
<th style="width:25%;text-align: right;">{{ $t('list.amount') }}</th>
|
||||
<th scope="col" style="width:35%;">{{ $t('list.piggy_bank') }}</th>
|
||||
<th scope="col" style="width:40%;">{{ $t('list.percentage') }}</th>
|
||||
<th scope="col" style="width:25%;text-align: right;">{{ $t('list.amount') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -23,11 +23,11 @@
|
||||
<caption style="display:none;">{{ $t('firefly.transaction_table_description') }}</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-left">{{ $t('firefly.description') }}</th>
|
||||
<th>{{ $t('firefly.opposing_account') }}</th>
|
||||
<th class="text-right">{{ $t('firefly.amount') }}</th>
|
||||
<th>{{ $t('firefly.category') }}</th>
|
||||
<th>{{ $t('firefly.budget') }}</th>
|
||||
<th scope="col" class="text-left">{{ $t('firefly.description') }}</th>
|
||||
<th scope="col">{{ $t('firefly.opposing_account') }}</th>
|
||||
<th scope="col" class="text-right">{{ $t('firefly.amount') }}</th>
|
||||
<th scope="col">{{ $t('firefly.category') }}</th>
|
||||
<th scope="col">{{ $t('firefly.budget') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -23,9 +23,9 @@
|
||||
<caption style="display:none;">{{ $t('firefly.transaction_table_description') }}</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-left">{{ $t('firefly.description') }}</th>
|
||||
<th>{{ $t('firefly.opposing_account') }}</th>
|
||||
<th class="text-right">{{ $t('firefly.amount') }}</th>
|
||||
<th scope="col" class="text-left">{{ $t('firefly.description') }}</th>
|
||||
<th scope="col">{{ $t('firefly.opposing_account') }}</th>
|
||||
<th scope="col" class="text-right">{{ $t('firefly.amount') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
<caption style="display:none;">{{ $t('firefly.transaction_table_description') }}</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-left">{{ $t('firefly.description') }}</th>
|
||||
<th class="text-right">{{ $t('firefly.amount') }}</th>
|
||||
<th scope="col" class="text-left">{{ $t('firefly.description') }}</th>
|
||||
<th scope="col" class="text-right">{{ $t('firefly.amount') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@ -39,9 +39,9 @@
|
||||
<table class="table table-responsive table-borderless mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ $t('firefly.name') }}</th>
|
||||
<th>{{ $t('firefly.profile_scopes') }}</th>
|
||||
<th></th>
|
||||
<th scope="col">{{ $t('firefly.name') }}</th>
|
||||
<th scope="col">{{ $t('firefly.profile_scopes') }}</th>
|
||||
<th scope="col"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
|
||||
@ -45,11 +45,11 @@
|
||||
<caption>{{ $t('firefly.profile_oauth_clients_header') }}</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ $t('firefly.profile_oauth_client_id') }}</th>
|
||||
<th>{{ $t('firefly.name') }}</th>
|
||||
<th>{{ $t('firefly.profile_oauth_client_secret') }}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th scope="col">{{ $t('firefly.profile_oauth_client_id') }}</th>
|
||||
<th scope="col">{{ $t('firefly.name') }}</th>
|
||||
<th scope="col">{{ $t('firefly.profile_oauth_client_secret') }}</th>
|
||||
<th scope="col"></th>
|
||||
<th scope="col"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
|
||||
@ -45,8 +45,8 @@
|
||||
<table class="table table-responsive table-borderless mb-0" v-if="tokens.length > 0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ $t('firefly.name') }}</th>
|
||||
<th></th>
|
||||
<th scope="col">{{ $t('firefly.name') }}</th>
|
||||
<th scope="col"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user