diff --git a/install/index.php b/install/index.php index 3a052354..599dc49a 100644 --- a/install/index.php +++ b/install/index.php @@ -16,7 +16,7 @@ We have four possible installation scenarios: */ $tableSql = hesk_dbQuery("SHOW TABLES LIKE '" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings'"); -$startingMigrationNumber = -1; +$startingMigrationNumber = 1; if (hesk_dbNumRows($tableSql) > 0) { // They have installed at LEAST to version 1.6.0. Just pull the version number OR migration number $migrationNumberSql = hesk_dbQuery("SELECT `Value` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'lastMigration'"); @@ -64,7 +64,6 @@ if (hesk_dbNumRows($tableSql) > 0) { Mods for HESK <?php echo MODS_FOR_HESK_NEW_VERSION; ?> Install / Upgrade - @@ -140,6 +139,8 @@ if (hesk_dbNumRows($tableSql) > 0) {
+
+
- + \ No newline at end of file diff --git a/install/js/install-script.js b/install/js/install-script.js index f80af6c6..2c93141b 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -113,9 +113,15 @@ function executeMigration(startingMigrationNumber, migrationNumber, latestMigrat executeMigration(startingMigrationNumber, newMigrationNumber, latestMigrationNumber, direction); } }, - error: function(data) { + error: function(response) { + try { + message = JSON.parse(response); + } catch (e) { + message = response.responseText; + } + $('#error-block').html("An error occurred! (Error Code: " + migrationNumber + ")
" + message).show(); updateProgressBar(migrationNumber, latestMigrationNumber, true, true); - console.error(data); + console.error(message); } }) } @@ -125,13 +131,14 @@ function updateProgressBar(migrationNumber, latestMigrationNumber, isError, isFi if (isError === true) { $progressBar.find('.progress-bar').removeClass('progress-bar-success') + .removeClass('active') .addClass('progress-bar-danger'); } else { var percentage = Math.round(migrationNumber / latestMigrationNumber * 100); $progressBar.find('.progress-bar').css('width', percentage + '%'); } - if (isFinished) { + if (isFinished && !isError) { goToStep(steps.length - 1); } } \ No newline at end of file