From 2d2712ed89f4cb647bd83b02a028c833f2966ab2 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Mon, 2 Jul 2018 14:38:27 +0100
Subject: [PATCH] Resolve ember-infinity InfinityRoute deprecation

no issue
- `ember-infinity` has deprecated it's route mixin in favour of it's new `infinity` service
---
 ghost/admin/app/routes/posts.js      | 7 ++++---
 ghost/admin/app/routes/team/index.js | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/app/routes/posts.js b/ghost/admin/app/routes/posts.js
index cd0dd43912..5a110d03e6 100644
--- a/ghost/admin/app/routes/posts.js
+++ b/ghost/admin/app/routes/posts.js
@@ -1,10 +1,11 @@
 import $ from 'jquery';
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
-import InfinityRoute from 'ember-infinity/mixins/route';
 import {assign} from '@ember/polyfills';
 import {isBlank} from '@ember/utils';
+import {inject as service} from '@ember/service';
 
-export default AuthenticatedRoute.extend(InfinityRoute, {
+export default AuthenticatedRoute.extend({
+    infinity: service(),
 
     queryParams: {
         type: {
@@ -69,7 +70,7 @@ export default AuthenticatedRoute.extend(InfinityRoute, {
             let perPage = this.get('perPage');
             let paginationSettings = assign({perPage, startingPage: 1}, paginationParams, queryParams);
 
-            return this.infinityModel('post', paginationSettings);
+            return this.infinity.model('post', paginationSettings);
         });
     },
 
diff --git a/ghost/admin/app/routes/team/index.js b/ghost/admin/app/routes/team/index.js
index 2b21aaa5c0..127687b5ba 100644
--- a/ghost/admin/app/routes/team/index.js
+++ b/ghost/admin/app/routes/team/index.js
@@ -1,12 +1,13 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
-import InfinityRoute from 'ember-infinity/mixins/route';
 import RSVP from 'rsvp';
 import styleBody from 'ghost-admin/mixins/style-body';
+import {inject as service} from '@ember/service';
+
+export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
+    infinity: service(),
 
-export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, InfinityRoute, {
     titleToken: 'Team',
-
     classNames: ['view-team'],
 
     modelPath: 'controller.activeUsers',
@@ -18,7 +19,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, Infinit
             let perPage = this.get('perPage');
 
             let modelPromises = {
-                activeUsers: this.infinityModel('user', {
+                activeUsers: this.infinity.model('user', {
                     modelPath,
                     perPage,
                     filter: 'status:-inactive',