Skip to content
This repository was archived by the owner on Nov 28, 2022. It is now read-only.

Removed third step to invite staff users from self-hoster setup #2286

Merged
merged 12 commits into from
Mar 8, 2022
Prev Previous commit
Next Next commit
Updated routes and fixed test
  • Loading branch information
sanne-san committed Mar 8, 2022
commit 42aaf50f7e1eaa4e3515c082767a2199fd387575
2 changes: 1 addition & 1 deletion app/controllers/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default class SetupController extends Controller {
@service ghostPaths;
@service router;

@match('router.currentRouteName', /^setup\.(two|three)$/)
@match('router.currentRouteName', /^setup\.two$/)
showBackLink;

@computed('router.currentRouteName')
Expand Down
3 changes: 0 additions & 3 deletions app/controllers/setup/two.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ export default class TwoController extends Controller.extend(ValidationEngine) {
@action
setup() {
this.setupTask.perform();
this.session.loadServerNotifications();
this.modals.open('modals/get-started');
this.router.transitionTo('home');
}

@action
Expand Down
1 change: 0 additions & 1 deletion app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Router.map(function () {
this.route('setup', function () {
this.route('one');
this.route('two');
this.route('three');
});
this.route('setup.done', {path: '/setup/done'});

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/setup-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import moment from 'moment';
import {Response} from 'miragejs';
import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
import {beforeEach, describe, it} from 'mocha';
import {blur, click, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
import {click, currentURL, fillIn, find, findAll} from '@ember/test-helpers';
import {enableLabsFlag} from '../helpers/labs-flag';
import {expect} from 'chai';
import {setupApplicationTest} from 'ember-mocha';
Expand Down