LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Improve initialization of Calendar model 

Fixes #156
pull/186/head
Francis Lachapelle 2016-01-14 16:41:58 -05:00
parent d90e1dc0ec
commit fe7a12bad0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/WebServerResources/js/Scheduler/Calendar.service.js
View File

@ -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;