kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Twig methods.

Browse Source
This commit is contained in:
James Cole
2016-01-15 08:13:19 +01:00
parent eef68c9b31
commit f76990bb9b
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,25 +118,6 @@ class RuleController extends Controller
$oldTriggers = [];
$oldActions = [];
// array of valid values for triggers.
$ruleTriggers = array_keys(Config::get('firefly.rule-triggers'));
$possibleTriggers = [];
foreach ($ruleTriggers as $key) {
if ($key != 'user_action') {
$possibleTriggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice');
}
}
unset($key, $ruleTriggers);
// array of valid values for actions
$ruleActions = array_keys(Config::get('firefly.rule-actions'));
$possibleActions = [];
foreach ($ruleActions as $key) {
$possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice');
}
unset($key, $ruleActions);
// has old input?
if (Input::old()) {
// process old triggers.
@@ -153,7 +134,6 @@ class RuleController extends Controller
'oldTrigger' => $oldTrigger,
'oldValue' => $oldValue,
'oldChecked' => $oldChecked,
'triggers' => $possibleTriggers,
'count' => $count
]
)->render();
@@ -185,13 +165,6 @@ class RuleController extends Controller
$subTitleIcon = 'fa-clone';
$subTitle = trans('firefly.make_new_rule', ['title' => $ruleGroup->title]);
// mandatory field: rule triggers on update-journal or store-journal.
$journalTriggers = [
'store-journal' => trans('firefly.rule_trigger_store_journal'),
'update-journal' => trans('firefly.rule_trigger_update_journal')
];
// put previous url in session if not redirect from store (not "create another").
if (Session::get('rules.rule.create.fromStore') !== true) {
Session::put('rules.rule.create.url', URL::previous());
@@ -201,7 +174,7 @@ class RuleController extends Controller
Session::flash('gaEventAction', 'create-rule');
return view(
'rules.rule.create', compact('subTitleIcon', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle', 'journalTriggers')
'rules.rule.create', compact('subTitleIcon', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
);
}

29
app/Support/Twig/Rule.php
View File

@@ -2,6 +2,7 @@
namespace FireflyIII\Support\Twig;
use Config;
use Twig_Extension;
use Twig_SimpleFunction;
@@ -27,6 +28,34 @@ class Rule extends Twig_Extension
}
);
$functions[] = new Twig_SimpleFunction(
'allRuleTriggers', function () {
$ruleTriggers = array_keys(Config::get('firefly.rule-triggers'));
$possibleTriggers = [];
foreach ($ruleTriggers as $key) {
if ($key != 'user_action') {
$possibleTriggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice');
}
}
unset($key, $ruleTriggers);
return $possibleTriggers;
}
);
$functions[] = new Twig_SimpleFunction('allRuleActions', function () {
// array of valid values for actions
$ruleActions = array_keys(Config::get('firefly.rule-actions'));
$possibleActions = [];
foreach ($ruleActions as $key) {
$possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice');
}
unset($key, $ruleActions);
return $possibleActions;
});
return $functions;
}