Fixes bug preveting from switching organizations (#2335)

Netflix · Jul 7, 2022 · 36efab7 · 36efab7
1 parent a635bec
commit 36efab7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/src/dispatch/static/dispatch/src/components/AppToolbar.vue b/src/dispatch/static/dispatch/src/components/AppToolbar.vue
@@ -126,17 +126,6 @@
           </v-list-item>
         </v-card>
       </v-menu>
-      <!--
-        <v-menu offset-y origin="center center" class="elelvation-1" :nudge-bottom="14" transition="scale-transition">
-        <v-btn icon text slot="activator">
-          <v-badge color="red" overlap>
-            <span slot="badge">3</span>
-            <v-icon medium>notifications</v-icon>
-          </v-badge>
-        </v-btn>
-        <notification-list></notification-list>
-      </v-menu>
-      -->
     </v-toolbar-items>
   </v-app-bar>
 </template>

diff --git a/src/dispatch/static/dispatch/src/router/config.js b/src/dispatch/static/dispatch/src/router/config.js
@@ -1,5 +1,4 @@
 import { DefaultLayout, DashboardLayout, BasicLayout } from "@/components/layouts"
-//import auth_store from "@/auth/store"
 
 const withPrefix = (prefix, routes) =>
   routes.map((route) => {

diff --git a/src/dispatch/static/dispatch/src/router/index.js b/src/dispatch/static/dispatch/src/router/index.js
@@ -50,10 +50,10 @@ router.beforeEach((to, from, next) => {
           .then(function () {
             return userSettings.load()
           })
-          .then(next)
+          .then(next())
       }
     } else {
-      userSettings.load().then(next)
+      userSettings.load().then(next())
     }
   } else {
     next()