Skip to content

fix: don't jump to main page or step 3 in wizard #5225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2020
Merged

fix: don't jump to main page or step 3 in wizard #5225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class extends Controller.extend(EventWizardMixin) {
@action
move() {
this.saveEventDataAndRedirectTo(
'events.view.edit.attendee',
'events.view.edit.other-details',
['tickets', 'socialLinks', 'copyright', 'tax', 'stripeAuthorization']
);
}
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default class EditRoute extends Route.extend(AuthenticatedRouteMixin, Eve

const event = this.modelFor('events.view');
const { currentUser } = this.authManager;
if (!(currentUser.isAnAdmin || currentUser.email === event.owner.get('email') || event.organizers.includes(currentUser)
if (!(currentUser.isAnAdmin || (currentUser.email === event.owner.get('email') || !event.owner.get('email')) || event.organizers.includes(currentUser)
Copy link
Member

@iamareebjamal iamareebjamal Oct 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this change necessary

Copy link
Contributor Author

@maze-runnar maze-runnar Oct 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when initially creating an event the owner email is null

|| event.coorganizers.includes(currentUser) || event.trackOrganizers.includes(currentUser)
|| event.registrars.includes(currentUser) || event.moderators.includes(currentUser))) {
this.transitionTo('index');
Expand Down