Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Resolve ember-infinity InfinityRoute deprecation

Browse source 
no issue
- `ember-infinity` has deprecated it's route mixin in favour of it's new `infinity` service
This commit is contained in:
Kevin Ansfield 2018-07-02 14:38:27 +01:00
parent 6ea33b487c
commit 2d2712ed89
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ghost/admin/app/routes/posts.js
View file

@ -1,10 +1,11 @@
import $ from 'jquery'; import $ from 'jquery';
import AuthenticatedRoute from 'ghost-admin/routes/authenticated'; import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import InfinityRoute from 'ember-infinity/mixins/route';
import {assign} from '@ember/polyfills'; import {assign} from '@ember/polyfills';
import {isBlank} from '@ember/utils'; import {isBlank} from '@ember/utils';
import {inject as service} from '@ember/service';
export default AuthenticatedRoute.extend(InfinityRoute, { export default AuthenticatedRoute.extend({
infinity: service(),
queryParams: { queryParams: {
type: { type: {
@ -69,7 +70,7 @@ export default AuthenticatedRoute.extend(InfinityRoute, {
let perPage = this.get('perPage'); let perPage = this.get('perPage');
let paginationSettings = assign({perPage, startingPage: 1}, paginationParams, queryParams); let paginationSettings = assign({perPage, startingPage: 1}, paginationParams, queryParams);
return this.infinityModel('post', paginationSettings); return this.infinity.model('post', paginationSettings);
}); });
}, },

9
ghost/admin/app/routes/team/index.js
View file

@ -1,12 +1,13 @@
import AuthenticatedRoute from 'ghost-admin/routes/authenticated'; import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings'; import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
import InfinityRoute from 'ember-infinity/mixins/route';
import RSVP from 'rsvp'; import RSVP from 'rsvp';
import styleBody from 'ghost-admin/mixins/style-body'; 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', titleToken: 'Team',
classNames: ['view-team'], classNames: ['view-team'],
modelPath: 'controller.activeUsers', modelPath: 'controller.activeUsers',
@ -18,7 +19,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, Infinit
let perPage = this.get('perPage'); let perPage = this.get('perPage');
let modelPromises = { let modelPromises = {
activeUsers: this.infinityModel('user', { activeUsers: this.infinity.model('user', {
modelPath, modelPath,
perPage, perPage,
filter: 'status:-inactive', filter: 'status:-inactive',