forked from vikunja/vikunja
fix(migration): show correct message after starting a migration
Related to https://github.com/go-vikunja/vikunja/issues/238
This commit is contained in:
parent
7acd1a7e51
commit
0b9ef27d04
|
@ -3,7 +3,7 @@
|
|||
<h1>{{ $t('migrate.titleService', {name: migrator.name}) }}</h1>
|
||||
<p>{{ $t('migrate.descriptionDo') }}</p>
|
||||
|
||||
<template v-if="message === '' && lastMigrationStartedAt === null">
|
||||
<template v-if="message === '' && lastMigrationStartedAt === null && !migrationJustStarted">
|
||||
<template v-if="isMigrating === false">
|
||||
<template v-if="migrator.isFileMigrator">
|
||||
<p>{{ $t('migrate.importUpload', {name: migrator.name}) }}</p>
|
||||
|
|
|
@ -51,7 +51,7 @@ func (s *MigrationListener) Handle(msg *message.Message) (err error) {
|
|||
mstr := registeredMigrators[event.MigratorKind]
|
||||
event.Migrator = mstr.MigrationStruct()
|
||||
|
||||
// unmarshaling again to make sure the migrator has the correct type now
|
||||
// unmarshalling again to make sure the migrator has the correct type now
|
||||
err = json.Unmarshal(msg.Payload, event)
|
||||
if err != nil {
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue
Block a user