IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-02 13:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7656 from firefly-iii/fix-7609

Browse Source 
Fix #7609
This commit is contained in:
James Cole 2023-06-14 18:45:14 +02:00 committed by GitHub
commit e72a483c49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/Models/Rule/TriggerController.php
View File

@ -96,6 +96,7 @@ class TriggerController extends Controller
$ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
} }
// file the rule(s) // file the rule(s)
$transactions = $ruleEngine->find(); $transactions = $ruleEngine->find();
$count = $transactions->count(); $count = $transactions->count();
@ -149,6 +150,7 @@ class TriggerController extends Controller
$ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
} }
// fire the rule(s) // fire the rule(s)
$ruleEngine->fire(); $ruleEngine->fire();

5
app/Support/Form/AccountForm.php
View File

@ -152,6 +152,11 @@ class AccountForm
return $this->select($name, $grouped, $value, $options); return $this->select($name, $grouped, $value, $options);
} }
/**
* @param array $types
* @param AccountRepositoryInterface|null $repository
* @return array
*/
private function getAccountsGrouped(array $types, AccountRepositoryInterface $repository = null): array private function getAccountsGrouped(array $types, AccountRepositoryInterface $repository = null): array
{ {
if (null === $repository) { if (null === $repository) {

2
app/TransactionRules/Engine/SearchRuleEngine.php
View File

@ -247,7 +247,7 @@ class SearchRuleEngine implements RuleEngineInterface
$str = sprintf('%s%d', $str, $transaction['transaction_journal_id']); $str = sprintf('%s%d', $str, $transaction['transaction_journal_id']);
} }
$key = sprintf('%d%s', $group['id'], $str); $key = sprintf('%d%s', $group['id'], $str);
Log::debug(sprintf('Return key: %s ', $key)); //Log::debug(sprintf('Return key: %s ', $key));
return $key; return $key;
} }

4
resources/views/form/assetAccountCheckList.twig
View File

@ -8,9 +8,9 @@
<div class="checkbox" style="margin-left:2em;"> <div class="checkbox" style="margin-left:2em;">
<label> <label>
{% if account in selected or (selected|length == 0 and options.select_all == true) %} {% if account in selected or (selected|length == 0 and options.select_all == true) %}
{{ Html.checkbox(name~'[]',true).id(id) }} {{ Html.checkbox(name~'[]',true, id).id(id) }}
{% else %} {% else %}
{{ Html.checkbox(name~'[]',false).id(id) }} {{ Html.checkbox(name~'[]',false, id).id(id) }}
{% endif %} {% endif %}
{{ account|escape }} {{ account|escape }}
</label> </label>

1
resources/views/form/checkbox.twig
View File

@ -6,7 +6,6 @@
col-sm-4 col-sm-4
{% endif %} {% endif %}
control-label">{{ label }}</label> control-label">{{ label }}</label>
<div class="{% if options.small %}col-sm-4{% else %}col-sm-8{% endif %}"> <div class="{% if options.small %}col-sm-4{% else %}col-sm-8{% endif %}">
<div class="checkbox"> <div class="checkbox">
<label> <label>