diff -r 5c9250f55f4b -r a2497a2b6224 cms/app-client/app/controllers/application.js --- a/cms/app-client/app/controllers/application.js Tue Jul 05 01:30:27 2016 +0200 +++ b/cms/app-client/app/controllers/application.js Tue Jul 05 16:53:04 2016 +0200 @@ -12,7 +12,6 @@ discourse: null, language: null, location: null, - notice: null, theme: null, filter: Ember.inject.service(), @@ -88,13 +87,32 @@ player: Ember.inject.service(), - itemIdObserver: Ember.observer('player.item', function() { + itemObserver: Ember.observer('player.item', function() { var self = this; - this.store.findRecord('document', this.get('player').get('item'), { reload: true }).then(function(it){ - self.get('player').set('model', it); + this.store.findRecord('document', this.get('player').get('item'), { reload: true }).then(function(model){ + self.get('player').set('model', model); }); }), + notice: null, + noticeModel: null, + + noticeObserver: Ember.observer('notice', function() { + var self = this; + if (this.get('notice')) { + this.store.findRecord('document', this.get('notice'), { reload: true }).then(function(model){ + self.set('noticeModel', model); + }); + } + }), + noticeModelObserver: Ember.observer('noticeModel', function() { + if (!this.get('noticeModel')) { + this.set('notice', null); + } + }), + + + init: function() { this._super(...arguments); this.get('player');