From c5b9a0f8d54afa96c5e07c9fe89a115489c82bb6 Mon Sep 17 00:00:00 2001
From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com>
Date: Fri, 2 Oct 2020 18:14:57 +0530
Subject: [PATCH] fix: don't jump to main page or step 3 in wizard (#5225)

---
 app/controllers/create.js      | 2 +-
 app/routes/events/view/edit.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/create.js b/app/controllers/create.js
index d1d7bbacaaf..75f2bdfad28 100644
--- a/app/controllers/create.js
+++ b/app/controllers/create.js
@@ -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']
     );
   }
diff --git a/app/routes/events/view/edit.js b/app/routes/events/view/edit.js
index ac48eae462e..6f10253f8d2 100644
--- a/app/routes/events/view/edit.js
+++ b/app/routes/events/view/edit.js
@@ -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)
         || event.coorganizers.includes(currentUser) || event.trackOrganizers.includes(currentUser)
         || event.registrars.includes(currentUser) || event.moderators.includes(currentUser))) {
       this.transitionTo('index');