mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

installer fixes

Browse Source
This commit is contained in:
Tony Murray
2020-06-29 00:58:06 -05:00
parent db5524dc09
commit c78ec70396
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Install/ChecksController.php
View File

@@ -41,8 +41,11 @@ class ChecksController extends InstallationController implements InstallerStep
$this->markStepComplete();
}
preg_match('/\d+\.\d+\.\d+/', PHP_VERSION, $matches);
$version = $matches[0] ?? PHP_VERSION;
return view('install.checks', $this->formatData([
'php_version' => PHP_VERSION,
'php_version' => $version,
'php_required' => Php::PHP_MIN_VERSION,
'php_ok' => $this->checkPhpVersion(),
'modules' => $this->moduleResults(),

5
resources/views/install/database.blade.php
View File

@@ -142,7 +142,7 @@
$('#migrate-warning').show()
$('#migrate-status>i').attr('class', 'fa fa-lg fa-spinner fa-spin');
$('#error-box').empty();
$('#migrate-btn').addClass('disabled')
$('#migrate-btn').prop('disabled', true).addClass('disabled')
var output = document.getElementById("db-update");
var xhr = new XMLHttpRequest();
@@ -156,13 +156,12 @@
// if error word in output, show the retry button
$('#migrate-warning').hide();
$('#migrate-status>i').attr('class', 'fa fa-lg fa-times-rectangle-o text-danger')
$('#migrate-btn').removeClass('disabled').text('@lang('install.migrate.retry')')
$('#migrate-btn').prop('disabled', false).removeClass('disabled').text('@lang('install.migrate.retry')')
$('#error-box').append($('<div class="alert alert-danger">@lang('install.migrate.error')</div>'));
}
};
xhr.timeout = 240000; // if no response for 4m, allow the user to retry
xhr.ontimeout = function (e) {
$("#retry-btn").css("display", "");
$('#migrate-warning').hide();
$('#error-box').append($('<div class="alert alert-danger">@lang('install.migrate.timeout')</div>'));
};