From 7fe96fda96f310788e057294b1edf413a3ccae98 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 2 Mar 2018 12:43:22 -0500 Subject: [PATCH] Update install files --- install/install_functions.inc.php | 2 +- install/js/install-script.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php index f8765ce0..894bb47e 100644 --- a/install/install_functions.inc.php +++ b/install/install_functions.inc.php @@ -16,7 +16,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');} // We will be installing this HESK version: define('HESK_NEW_VERSION','2.7.6'); -define('MODS_FOR_HESK_NEW_VERSION','3.2.4'); +define('MODS_FOR_HESK_NEW_VERSION','3.3.0'); define('REQUIRE_PHP_VERSION','5.3.0'); define('REQUIRE_MYSQL_VERSION','5.0.7'); diff --git a/install/js/install-script.js b/install/js/install-script.js index 0e6eda7a..04835fc0 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -104,10 +104,10 @@ function executeMigration(startingMigrationNumber, migrationNumber, latestMigrat console.log('latestMigrationNumber: ' + latestMigrationNumber); console.info('---'); if (migrationNumber === latestMigrationNumber || (migrationNumber === startingMigrationNumber && direction === 'down')) { - updateProgressBar(migrationNumber, latestMigrationNumber, direction === 'down', true); + updateProgressBar(migrationNumber - startingMigrationNumber, latestMigrationNumber - startingMigrationNumber, direction === 'down', true); console.log('%c Success! ', 'color: white; background-color: green; font-size: 2em'); } else { - updateProgressBar(migrationNumber, latestMigrationNumber, false, false); + updateProgressBar(migrationNumber - startingMigrationNumber, latestMigrationNumber - startingMigrationNumber, false, false); var newMigrationNumber = direction === 'up' ? migrationNumber + 1 : migrationNumber - 1; executeMigration(startingMigrationNumber, newMigrationNumber, latestMigrationNumber, direction); } @@ -121,7 +121,7 @@ function executeMigration(startingMigrationNumber, migrationNumber, latestMigrat $errorBlock = $('#error-block'); $errorBlock.html($errorBlock.html() + "

An error occurred! (Error Code: " + migrationNumber + ")
" + message).show(); - updateProgressBar(migrationNumber, latestMigrationNumber, true, false); + updateProgressBar(migrationNumber - startingMigrationNumber, latestMigrationNumber - startingMigrationNumber, true, false); if (direction === 'up') { // Revert!