IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some code cleanup courtesy of PHPStorm.

Browse Source
This commit is contained in:
James Cole
2016-01-15 17:53:54 +01:00
parent 820722f44e
commit f69be86c74
12 changed files with 39 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,28 +134,20 @@ class RuleController extends Controller
{
// has old input?
if (Input::old()) {
// process old triggers.
$oldTriggers = $this->getPreviousTriggers();
$triggerCount = count($oldTriggers);
// process old actions
$oldActions = $this->getPreviousActions();
$actionCount = count($oldActions);
$oldActions = $this->getPreviousActions();
$actionCount = count($oldActions);
} else {
// get current triggers
$oldTriggers = $this->getCurrentTriggers($rule);
$triggerCount = count($oldTriggers);
// get current actions
$oldActions = $this->getCurrentActions($rule);
$actionCount = count($oldActions);
$oldActions = $this->getCurrentActions($rule);
$actionCount = count($oldActions);
}
// get rule trigger for update / store-journal:
$primaryTrigger = $rule->ruleTriggers()->where('trigger_type', 'user_action')->first()->trigger_value;
$subTitle = trans('firefly.edit_rule', ['title' => $rule->title]);
$subTitle = trans('firefly.edit_rule', ['title' => $rule->title]);
// put previous url in session if not redirect from store (not "return_to_edit").
if (Session::get('rules.rule.edit.fromUpdate') !== true) {