From c07aaafd13e057369f099e5e2b3dd183a1ba3b4e Mon Sep 17 00:00:00 2001 From: zinyando Date: Fri, 13 May 2016 19:33:30 +0200 Subject: [PATCH] Use get method to prevent exeptions when properties are missing --- app/app/routes/application.js | 4 ++-- app/app/services/document.js | 5 +++-- app/app/services/folder.js | 9 ++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/app/routes/application.js b/app/app/routes/application.js index ade10ade..da384933 100644 --- a/app/app/routes/application.js +++ b/app/app/routes/application.js @@ -23,7 +23,7 @@ export default Ember.Route.extend({ // Session ready? return session.boot().then(function() { // Need to authenticate? - if (!session.appMeta.allowAnonymousAccess && !session.authenticated && + if (!session.get("appMeta.allowAnonymousAccess") && !session.get("authenticated") && is.not.startWith(transition.targetName, 'auth.')) { if (!self.transitioning) { session.set('previousTransition', transition); @@ -52,4 +52,4 @@ export default Ember.Route.extend({ return true; } }, -}); \ No newline at end of file +}); diff --git a/app/app/services/document.js b/app/app/services/document.js index dc230af9..8f036c95 100644 --- a/app/app/services/document.js +++ b/app/app/services/document.js @@ -36,7 +36,8 @@ export default Ember.Service.extend({ // Returns all documents for specified folder. getAllByFolder(folderId) { - let url = this.get('sessionService').appMeta.getUrl(`documents?folder=${folderId}`); + let appMeta = this.get('sessionService.appMeta') + let url = appMeta.getUrl(`documents?folder=${folderId}`); return new Ember.RSVP.Promise(function(resolve, reject) { $.ajax({ @@ -460,4 +461,4 @@ export default Ember.Service.extend({ }); }); }, -}); \ No newline at end of file +}); diff --git a/app/app/services/folder.js b/app/app/services/folder.js index b0ed6b18..432641ca 100644 --- a/app/app/services/folder.js +++ b/app/app/services/folder.js @@ -22,7 +22,8 @@ export default BaseService.extend({ // Add a new folder. add(folder) { - let url = this.get('sessionService').appMeta.getUrl(`folders`); + let appMeta = this.get('sessionService.appMeta'); + let url = appMeta.getUrl(`folders`); return new Ember.RSVP.Promise(function(resolve, reject) { $.ajax({ @@ -43,7 +44,8 @@ export default BaseService.extend({ // Returns folder model for specified folder id. getFolder(id) { - let url = this.get('sessionService').appMeta.getUrl(`folders/${id}`); + let appMeta = this.get('sessionService.appMeta') + let url = appMeta.getUrl(`folders/${id}`); return new Ember.RSVP.Promise(function(resolve, reject) { $.ajax({ @@ -157,7 +159,8 @@ export default BaseService.extend({ // reloads and caches folders. reload() { - let url = this.get('sessionService').appMeta.getUrl(`folders`); + let appMeta = this.get('sessionService.appMeta') + let url = appMeta.getUrl(`folders`); return new Ember.RSVP.Promise(function(resolve, reject) { $.ajax({