diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo index d4cbfea650..aecfe1cf08 100644 --- a/ghost/admin/.lint-todo +++ b/ghost/admin/.lint-todo @@ -963,3 +963,4 @@ remove|ember-template-lint|no-action|44|19|44|19|40bf79016dee9fe1dca46383af6c4c3 remove|ember-template-lint|no-action|50|19|50|19|de05e88a1b6b658430d78f36b93dfa372903c26d|1658102400000|1668474000000|1673658000000|app/templates/settings/staff/index.hbs remove|ember-template-lint|no-action|89|103|89|103|8a5526f86c3c3289a47e2e033e39292ceaa3999e|1658102400000|1668474000000|1673658000000|app/templates/settings/staff/index.hbs remove|ember-template-lint|no-action|92|105|92|105|8ef55f22a4332a43d47b2508c5903048f972cefa|1658102400000|1668474000000|1673658000000|app/templates/settings/staff/index.hbs +remove|ember-template-lint|no-route-action|63|62|63|62|e9f8663f45f4f41bc590f8db8df3d5dabd9cc732|1658102400000|1668474000000|1673658000000|app/templates/settings/staff/index.hbs diff --git a/ghost/admin/app/controllers/settings/staff/index.js b/ghost/admin/app/controllers/settings/staff/index.js index 19ae290a1e..848af932ce 100644 --- a/ghost/admin/app/controllers/settings/staff/index.js +++ b/ghost/admin/app/controllers/settings/staff/index.js @@ -51,9 +51,9 @@ export default class IndexController extends Controller { } @task - *backgroundUpdate() { - let users = this.fetchUsers.perform(); - let invites = this.fetchInvites.perform(); + *backgroundUpdateTask() { + let users = this.fetchUsersTask.perform(); + let invites = this.fetchInvitesTask.perform(); try { yield RSVP.all([users, invites]); @@ -63,12 +63,12 @@ export default class IndexController extends Controller { } @task - *fetchUsers() { + *fetchUsersTask() { yield this.store.query('user', {limit: 'all'}); } @task - *fetchInvites() { + *fetchInvitesTask() { if (this.currentUser.isAuthorOrContributor) { return; } diff --git a/ghost/admin/app/routes/settings/staff/index.js b/ghost/admin/app/routes/settings/staff/index.js index 9c37e4e765..9ae517fb57 100644 --- a/ghost/admin/app/routes/settings/staff/index.js +++ b/ghost/admin/app/routes/settings/staff/index.js @@ -22,12 +22,7 @@ export default class IndexRoute extends AuthenticatedRoute { setupController(controller) { super.setupController(...arguments); - controller.backgroundUpdate.perform(); - } - - @action - reload() { - this.controller.backgroundUpdate.perform(); + controller.backgroundUpdateTask.perform(); } buildRouteInfoMetadata() { diff --git a/ghost/admin/app/templates/settings/staff/index.hbs b/ghost/admin/app/templates/settings/staff/index.hbs index 0ce8a36fe7..df20092dc2 100644 --- a/ghost/admin/app/templates/settings/staff/index.hbs +++ b/ghost/admin/app/templates/settings/staff/index.hbs @@ -62,7 +62,7 @@