From 2ce798972244e37e854386f47fd1a5180d68c5d1 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Thu, 16 Apr 2015 17:53:45 -0700
Subject: [PATCH] CRM-16277 - Sort groups and mailings alphabetically in the
 recipients drop-downs.

----------------------------------------
* CRM-16277: "DB Error: unknown error" in CiviMail upon adding recipient group
  https://issues.civicrm.org/jira/browse/CRM-16277
---
 ang/crmMailing/Recipients.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ang/crmMailing/Recipients.html b/ang/crmMailing/Recipients.html
index 9d84e93931..5fb611731f 100644
--- a/ang/crmMailing/Recipients.html
+++ b/ang/crmMailing/Recipients.html
@@ -6,15 +6,15 @@ Directive: crmMailingRecipients
     <option ng-repeat="grp in mandatoryGroups" value="{{grp.id}} civicrm_group include">{{ts('Search Results')}}</option>
   </optgroup>
   <optgroup label="{{ts('Include Group')}}">
-    <option ng-repeat="grp in groups" value="{{grp.id}} civicrm_group include">{{grp.title}}</option>
+    <option ng-repeat="grp in groups|orderBy:'title'" value="{{grp.id}} civicrm_group include">{{grp.title}}</option>
   </optgroup>
   <optgroup label="{{ts('Exclude Group')}}">
-    <option ng-repeat="grp in groups" value="{{grp.id}} civicrm_group exclude">{{grp.title}}</option>
+    <option ng-repeat="grp in groups|orderBy:'title'" value="{{grp.id}} civicrm_group exclude">{{grp.title}}</option>
   </optgroup>
   <optgroup label="{{ts('Include Past Recipients From')}}">
-    <option ng-repeat="ml in mailings" value="{{ml.id}} civicrm_mailing include">{{ml.name}} ({{parseDate(ml.scheduled_date) | date:'mediumDate'}})</option>
+    <option ng-repeat="ml in mailings|orderBy:'name'" value="{{ml.id}} civicrm_mailing include">{{ml.name}} ({{parseDate(ml.scheduled_date) | date:'mediumDate'}})</option>
   </optgroup>
   <optgroup label="{{ts('Exclude Past Recipients From')}}">
-    <option ng-repeat="ml in mailings" value="{{ml.id}} civicrm_mailing exclude">{{ml.name}} ({{parseDate(ml.scheduled_date) | date:'mediumDate'}})</option>
+    <option ng-repeat="ml in mailings|orderBy:'name'" value="{{ml.id}} civicrm_mailing exclude">{{ml.name}} ({{parseDate(ml.scheduled_date) | date:'mediumDate'}})</option>
   </optgroup>
 </select>
-- 
2.25.1