From 4ae3b06dbad20b663a4d9841c833b708fcc7869a Mon Sep 17 00:00:00 2001 From: Seyi Adebajo Date: Sun, 26 Mar 2017 13:45:06 -0700 Subject: [PATCH] Renames current-user service on application route to avoid conflict with legacy use of currentUser in various controllers --- wherehows-web/app/routes/application.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wherehows-web/app/routes/application.js b/wherehows-web/app/routes/application.js index 4a7a686457..b4578411a4 100644 --- a/wherehows-web/app/routes/application.js +++ b/wherehows-web/app/routes/application.js @@ -11,7 +11,7 @@ const { export default Route.extend(ApplicationRouteMixin, { // Injected Ember#Service for the current user - currentUser: service(), + sessionUser: service('current-user'), /** * Attempt to load the current user @@ -38,7 +38,7 @@ export default Route.extend(ApplicationRouteMixin, { * @private */ _loadCurrentUser() { - return get(this, 'currentUser') + return get(this, 'sessionUser') .load() .catch(() => get(this, 'session').invalidate()); },