vikunja
/
vikunja
6
43
Fork 71
Code Issues 150 Pull Requests 16 Packages Releases 32 Activity

fix(migration): show correct message after starting a migration
continuous-integration/drone/push Build is failing Details 

Related to https://github.com/go-vikunja/vikunja/issues/238
This commit is contained in:
kolaente 2024-04-07 15:11:59 +02:00
parent 7acd1a7e51
commit 0b9ef27d04
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/migrate/MigrationHandler.vue
View File

@ -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>

2
pkg/modules/migration/handler/listeners.go
View File

@ -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