From 3b411101cd6fa7138ec80495058423541dc19b5f Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 18 Dec 2017 15:49:41 -0500
Subject: [PATCH] (js) Sort categories in event and task editors

Fixes #4349
---
 NEWS                                                      | 1 +
 UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox | 2 +-
 UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 1f35d9d73..0522c9be8 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ Enhancements
  - [web] search scope of address book is now respected
  - [web] avoid redirection to forbidden module (via ModulesConstraints)
  - [web] lower constraints on dates range of auto-reply message (#4161)
+ - [web] sort categories in event and task editors (#4349)
 
 Bug fixes
  - [core] yearly repeating events are not shown in web calendar (#4237)
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
index d1b5a5d49..be723e67f 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
@@ -56,7 +56,7 @@
            <md-autocomplete
                 md-selected-item="editor.categories.selected"
                 md-search-text="editor.categories.searchText"
-                md-items="category in editor.component.constructor.filterCategories(editor.categories.searchText)"
+                md-items="category in editor.component.constructor.filterCategories(editor.categories.searchText) | orderBy"
                 md-min-length="0"
                 label:placeholder="Add a category">
               <span md-highlight-text="editor.categories.searchText">{{category}}</span>
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
index 136dab718..232f2dd51 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
@@ -49,7 +49,7 @@
             <md-autocomplete
                 md-selected-item="editor.categories.selected"
                 md-search-text="editor.categories.searchText"
-                md-items="category in editor.component.constructor.filterCategories(editor.categories.searchText)"
+                md-items="category in editor.component.constructor.filterCategories(editor.categories.searchText) | orderBy"
                 md-min-length="0"
                 label:placeholder="Add a category">
               <span md-highlight-text="editor.categories.searchText">{{category}}</span>