From 006c2ae18648c3336fa0bc82940c4b32af64f2d8 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 15 Jan 2016 08:06:33 +0100
Subject: [PATCH] Refer to dedicated methods instead of variables.

---
 resources/views/rules/partials/action.twig  | 2 +-
 resources/views/rules/partials/trigger.twig | 2 +-
 resources/views/rules/rule/create.twig      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/rules/partials/action.twig b/resources/views/rules/partials/action.twig
index e7ec792c79..1e5d1247bc 100644
--- a/resources/views/rules/partials/action.twig
+++ b/resources/views/rules/partials/action.twig
@@ -9,7 +9,7 @@
         {% endif %}
 
         <select name="rule-action[{{ count }}]" class="form-control">
-            {% for key,name in actions %}
+            {% for key,name in allRuleActions() %}
                 <option value="{{ key }}" label="{{ name }}"
                         {% if key == oldTrigger %}
                             selected
diff --git a/resources/views/rules/partials/trigger.twig b/resources/views/rules/partials/trigger.twig
index 20b5d86a04..60cd67c9e2 100644
--- a/resources/views/rules/partials/trigger.twig
+++ b/resources/views/rules/partials/trigger.twig
@@ -9,7 +9,7 @@
         {% endif %}
 
         <select name="rule-trigger[{{ count }}]" class="form-control">
-            {% for key,name in triggers %}
+            {% for key,name in allRuleTriggers() %}
                 <option value="{{ key }}" label="{{ name }}"
                         {% if key == oldTrigger %}
                             selected
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index c3f15ce345..87a8482e2a 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -15,7 +15,7 @@
                 </div>
                 <div class="box-body">
                     {{ ExpandedForm.text('title') }}
-                    {{ ExpandedForm.select('trigger',journalTriggers) }}
+                    {{ ExpandedForm.select('trigger',allJournalTriggers()) }}
                     {{ ExpandedForm.checkbox('stop_processing',1,null, {helpText: trans('firefly.rule_help_stop_processing')}) }}
                 </div>
             </div>