kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 18:54:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #902

Browse Source
This commit is contained in:
James Cole
2017-10-19 18:58:54 +02:00
parent 7f5134f758
commit 7e8e766ab4
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/RuleController.php
View File

@@ -79,6 +79,7 @@ class RuleController extends Controller
// has old input? // has old input?
if ($request->old()) { if ($request->old()) {
echo '!';
// process old triggers. // process old triggers.
$oldTriggers = $this->getPreviousTriggers($request); $oldTriggers = $this->getPreviousTriggers($request);
$triggerCount = count($oldTriggers); $triggerCount = count($oldTriggers);
@@ -168,20 +169,27 @@ class RuleController extends Controller
{ {
/** @var RuleGroupRepositoryInterface $ruleGroupRepository */ /** @var RuleGroupRepositoryInterface $ruleGroupRepository */
$ruleGroupRepository = app(RuleGroupRepositoryInterface::class); $ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
$oldTriggers = $this->getCurrentTriggers($rule);
$triggerCount = count($oldTriggers);
$oldActions = $this->getCurrentActions($rule);
$actionCount = count($oldActions);
$ruleGroups = ExpandedForm::makeSelectList($ruleGroupRepository->get()); $ruleGroups = ExpandedForm::makeSelectList($ruleGroupRepository->get());
$triggerCount = 0;
$actionCount = 0;
$oldActions = [];
$oldTriggers = [];
// has old input? // has old input?
if ($request->old()) { if (count($request->old()) > 0) {
$oldTriggers = $this->getPreviousTriggers($request); $oldTriggers = $this->getPreviousTriggers($request);
$triggerCount = count($oldTriggers); $triggerCount = count($oldTriggers);
$oldActions = $this->getPreviousActions($request); $oldActions = $this->getPreviousActions($request);
$actionCount = count($oldActions); $actionCount = count($oldActions);
} }
// overrule old input when it as no rule data:
if ($triggerCount === 0 && $actionCount === 0) {
$oldTriggers = $this->getCurrentTriggers($rule);
$triggerCount = count($oldTriggers);
$oldActions = $this->getCurrentActions($rule);
$actionCount = count($oldActions);
}
// get rule trigger for update / store-journal: // get rule trigger for update / store-journal:
$primaryTrigger = $repository->getPrimaryTrigger($rule); $primaryTrigger = $repository->getPrimaryTrigger($rule);
$subTitle = trans('firefly.edit_rule', ['title' => $rule->title]); $subTitle = trans('firefly.edit_rule', ['title' => $rule->title]);