From b948384ec9a5a8d463c3f8ea204b6adef9402ba5 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 3 Jul 2015 21:45:59 -0400
Subject: [PATCH] (js) Preload ACL users in Calendar module

---
 .../js/Scheduler/CalendarsController.js       | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/UI/WebServerResources/js/Scheduler/CalendarsController.js b/UI/WebServerResources/js/Scheduler/CalendarsController.js
index f1a0da2e5..3dfa227ad 100644
--- a/UI/WebServerResources/js/Scheduler/CalendarsController.js
+++ b/UI/WebServerResources/js/Scheduler/CalendarsController.js
@@ -147,17 +147,19 @@
     }
 
     function share(calendar) {
-      $mdDialog.show({
-        templateUrl: calendar.id + '/UIxAclEditor', // UI/Templates/UIxAclEditor.wox
-        controller: CalendarACLController,
-        controllerAs: 'acl',
-        clickOutsideToClose: true,
-        escapeToClose: true,
-        locals: {
-          usersWithACL: calendar.$acl.$users(),
-          User: User,
-          folder: calendar
-        }
+      calendar.$acl.$users().then(function() {
+        $mdDialog.show({
+          templateUrl: calendar.id + '/UIxAclEditor', // UI/Templates/UIxAclEditor.wox
+          controller: CalendarACLController,
+          controllerAs: 'acl',
+          clickOutsideToClose: true,
+          escapeToClose: true,
+          locals: {
+            usersWithACL: calendar.$acl.users,
+            User: User,
+            folder: calendar
+          }
+        });
       });
 
       /**