From fe7a12bad0f226f30a7f3d9c75c55c53d6b11beb Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 14 Jan 2016 16:41:58 -0500
Subject: [PATCH] (js) Improve initialization of Calendar model

Fixes #156
---
 UI/WebServerResources/js/Scheduler/Calendar.service.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/UI/WebServerResources/js/Scheduler/Calendar.service.js b/UI/WebServerResources/js/Scheduler/Calendar.service.js
index 2b06b51b9..6d0023316 100644
--- a/UI/WebServerResources/js/Scheduler/Calendar.service.js
+++ b/UI/WebServerResources/js/Scheduler/Calendar.service.js
@@ -16,9 +16,6 @@
       var newCalendarData = Calendar.$$resource.create('createFolder', this.name);
       this.$unwrap(newCalendarData);
     }
-    if (this.id) {
-      this.$acl = new Calendar.$$Acl('Calendar/' + this.id);
-    }
   }
 
   /**
@@ -268,6 +265,9 @@
   Calendar.prototype.init = function(data) {
     this.color = this.color || '#AAAAAA';
     angular.extend(this, data);
+    if (this.id) {
+      this.$acl = new Calendar.$$Acl('Calendar/' + this.id);
+    }
     // Add 'isOwned' and 'isSubscription' attributes based on active user (TODO: add it server-side?)
     this.isOwned = Calendar.activeUser.isSuperUser || this.owner == Calendar.activeUser.login;
     this.isSubscription = !this.isRemote && this.owner != Calendar.activeUser.login;