From f76990bb9b48b7a0798483c003da2ba82fdc49a1 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 15 Jan 2016 08:13:19 +0100
Subject: [PATCH] Twig methods.

---
 app/Http/Controllers/RuleController.php | 29 +------------------------
 app/Support/Twig/Rule.php               | 29 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index 26caacfc53..b9b1ca235d 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -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')
         );
     }
 
diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php
index ebc198b190..8cd9ef6779 100644
--- a/app/Support/Twig/Rule.php
+++ b/app/Support/Twig/Rule.php
@@ -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;
     }