diff --git a/web/src/App.vue b/web/src/App.vue index fc70347..c6b3956 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -52,11 +52,6 @@ export default { }, created: function () { document.title = document.location.hostname; - this.loadEvents().then(() => { - /*if (this.isLoggedIn) { - this.afterLogin(); - }*/ - }); } }; diff --git a/web/src/components/AuthenticatedImage.vue b/web/src/components/AuthenticatedImage.vue index a1e1862..9e1a963 100644 --- a/web/src/components/AuthenticatedImage.vue +++ b/web/src/components/AuthenticatedImage.vue @@ -7,7 +7,7 @@ diff --git a/web/src/views/Ticket.vue b/web/src/views/Ticket.vue index 84d9e05..f9512c1 100644 --- a/web/src/views/Ticket.vue +++ b/web/src/views/Ticket.vue @@ -62,6 +62,7 @@ export default { }, methods: { ...mapActions(['deleteItem', 'markItemReturned', 'sendMail', 'updateTicketPartial', 'postComment']), + ...mapActions(['loadTickets', 'fetchTicketStates', 'loadUsers', 'scheduleAfterInit']), handleMail(mail) { this.sendMail({ id: this.ticket.id, @@ -87,7 +88,9 @@ export default { }) } }, - created() {} + mounted() { + this.scheduleAfterInit(() => [this.fetchTicketStates(), this.loadTickets(), this.loadUsers()]); + } }; diff --git a/web/src/views/Tickets.vue b/web/src/views/Tickets.vue index ed336fd..37de2fb 100644 --- a/web/src/views/Tickets.vue +++ b/web/src/views/Tickets.vue @@ -65,7 +65,7 @@ export default { ...mapGetters(['stateInfo', 'getEventSlug', 'layout']), }, methods: { - ...mapActions(['loadTickets', 'fetchTicketStates']), + ...mapActions(['loadTickets', 'fetchTicketStates', 'scheduleAfterInit']), gotoDetail(ticket) { this.$router.push({name: 'ticket', params: {id: ticket.id}}); }, @@ -80,9 +80,8 @@ export default { }; } }, - created() { - this.fetchTicketStates(); - this.loadTickets(); + mounted() { + this.scheduleAfterInit(() => [this.fetchTicketStates(), this.loadTickets()]); } };