(js) Preload ACL users in Calendar module

2015-07-03 21:45:59 -04:00 · 2015-07-03 21:45:59 -04:00 · b948384ec9
parent 1c34e71cdc
commit b948384ec9
1 changed files with 13 additions and 11 deletions
--- 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
+          }
+        });
      });

      /**