Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fixed: Migration script suggests displays "Upgrade completed!" text and allows the user to click the "Go to MailPoet" button while the migration is still being performed.

Browse Source
This commit is contained in:
fred
2017-06-06 19:03:50 +02:00
parent cbf0a7684f
commit 2c93a105cc
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/mp2migrator.js
View File

@ -18,8 +18,8 @@ define('mp2migrator', ['mailpoet', 'jquery'], function(MailPoet, jQuery) {
}, },
updateDisplay: function () { updateDisplay: function () {
MailPoet.MP2Migrator.displayLogs(); MailPoet.MP2Migrator.displayLogs_timeout = setTimeout(MailPoet.MP2Migrator.displayLogs, 1000);
MailPoet.MP2Migrator.updateProgressbar(); MailPoet.MP2Migrator.updateProgressbar_timeout = setTimeout(MailPoet.MP2Migrator.updateProgressbar, 1000);
}, },
displayLogs: function () { displayLogs: function () {

3
lib/Config/MP2Migrator.php
View File

@ -140,10 +140,9 @@ class MP2Migrator {
if(!Setting::getValue('mailpoet_migration_started', false)) { if(!Setting::getValue('mailpoet_migration_started', false)) {
$this->eraseMP3Data(); $this->eraseMP3Data();
Setting::setValue('mailpoet_migration_started', true); Setting::setValue('mailpoet_migration_started', true);
$this->displayDataToMigrate();
} }
$this->displayDataToMigrate();
$this->importSegments(); $this->importSegments();
$this->segments_mapping = $this->getImportedMapping('segments'); $this->segments_mapping = $this->getImportedMapping('segments');
$this->importCustomFields(); $this->importCustomFields();