From aed5ef3fba66d7396ef4b2338b5110dbe2c95a8a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Sep 2017 10:16:45 +0200
Subject: [PATCH] Sort triggers and actions

---
 app/Http/Controllers/JsonController.php | 1 +
 app/Support/Twig/Rule.php               | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php
index f9162ed690..4805e620eb 100644
--- a/app/Http/Controllers/JsonController.php
+++ b/app/Http/Controllers/JsonController.php
@@ -240,6 +240,7 @@ class JsonController extends Controller
                 $triggers[$key] = trans('firefly.rule_trigger_' . $key . '_choice');
             }
         }
+        asort($triggers);
 
         $view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
 
diff --git a/app/Support/Twig/Rule.php b/app/Support/Twig/Rule.php
index 9924e6f7a0..42efe5a2b6 100644
--- a/app/Support/Twig/Rule.php
+++ b/app/Support/Twig/Rule.php
@@ -39,6 +39,7 @@ class Rule extends Twig_Extension
                 $possibleActions[$key] = trans('firefly.rule_action_' . $key . '_choice');
             }
             unset($key, $ruleActions);
+            asort($possibleActions);
 
             return $possibleActions;
         }
@@ -75,6 +76,7 @@ class Rule extends Twig_Extension
                 }
             }
             unset($key, $ruleTriggers);
+            asort($possibleTriggers);
 
             return $possibleTriggers;
         }