clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 18:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

run through and refinement

Browse Source
This commit is contained in:
Tony Murray 2020-06-08 09:21:31 -05:00
parent 94a71f9f41
commit adf3afdaca
7 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ class ChecksController extends \App\Http\Controllers\Controller
return $status;
}
public static function enabled(): bool
public static function enabled()
{
return true;
}

2
app/Http/Controllers/Install/DatabaseController.php
View File

@ -74,7 +74,7 @@ class DatabaseController extends Controller
]);
}
public static function enabled(): bool
public static function enabled()
{
return true;
}

2
app/Http/Controllers/Install/DatabaseMigrationController.php
View File

@ -65,7 +65,7 @@ class DatabaseMigrationController extends Controller
return $response;
}
public static function enabled(): bool
public static function enabled()
{
return session('install.database');
}

4
app/Http/Controllers/Install/MakeUserController.php
View File

@ -73,9 +73,9 @@ class MakeUserController extends \App\Http\Controllers\Controller
return redirect()->back()->with('message', $message);
}
public static function enabled(): bool
public static function enabled()
{
return true;
return session('install.migrate');
}
public static function icon(): string

6
resources/lang/en/install.php
View File

@ -31,6 +31,12 @@ return [
],
'migrate' => [
'title' => 'Build Database',
'building' => 'Building Database structure...',
'building_interrupt' => 'Do not close this page or interrupt the import!',
'wait' => 'Please Wait...',
'timeout' => 'HTTP request timed out, your database structure may be inconsistent.',
'error' => 'Error encountered, check output for details.',
'retry' => 'Retry',
],
'user' => [
'title' => 'Create Admin User',

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

@ -79,11 +79,12 @@
data: $('#database-form').serialize(),
success: function (response) {
if (response.result === 'ok') {
$('#database-status>i').attr('class', 'fa fa-2x fa-check-circle text-success')
$('#database-status>i').attr('class', 'fa fa-2x fa-check-circle text-success');
$('#install-migrate-button').removeClass('disabled');
} else {
$('#database-status>i').attr('class', 'fa fa-2x fa-times-circle text-danger')
if (response.message) {
$('#error-box').append($('<div class="db-error alert alert-danger">' + response.message + '</div>'))
$('#error-box').append($('<div class="alert alert-danger">' + response.message + '</div>'))
}
}
},

40
resources/views/install/migrate-database.blade.php
View File

@ -5,24 +5,22 @@
@section('content')
<div class="row">
<div class="col-12">
<h5 class="text-center">Importing MySQL DB - Do not close this page or interrupt the import</h5>
<textarea readonly id="db-update" class="form-control" rows="20" placeholder="Please Wait..." style="resize:vertical;"></textarea>
<label for="db-update">@lang('install.migrate.building')<br />@lang('install.migrate.building_interrupt')</label>
<textarea readonly id="db-update" class="form-control" rows="20" placeholder="@lang('install.migrate.wait')"></textarea>
</div>
</div>
<div class="row">
<div class="col-12">
If you don't see any errors or messages above then the database setup has been successful.<br />
<form class="form-horizontal" role="form" method="post">
@csrf
<input type="button" id="retry-btn" value="Retry" onClick="window.location.reload()" style="display: none;" class="btn btn-success">
<button type="submit" id="add-user-btn" class="btn btn-success float-right" disabled>Goto Add User</button>
</form>
<button type="button" id="retry-btn" onClick="window.location.reload()" class="btn btn-success pull-right">
@lang('install.migrate.retry')
</button>
</div>
</div>
@endsection
@section('scripts')
<script type="text/javascript">
var migrate_error = false;
var output = document.getElementById("db-update");
var xhr = new XMLHttpRequest();
xhr.open("GET", "{{ route('install.action.migrate') }}", true);
@ -33,20 +31,36 @@
output.scrollTop = output.scrollHeight - output.clientHeight; // scrolls the output area
if (output.innerHTML.indexOf('Error!') !== -1) {
// if error word in output, show the retry button
migrate_error = true;
$("#retry-btn").css("display", "");
$('#error-box').append($('<div class="alert alert-danger">@lang('install.migrate.error')</div>'))
}
};
xhr.timeout = 90000; // if no response for 90s, allow the user to retry
xhr.timeout = 240000; // if no response for 4m, allow the user to retry
xhr.ontimeout = function (e) {
migrate_error = true;
$("#retry-btn").css("display", "");
$('#error-box').append($('<div class="alert alert-danger">@lang('install.migrate.timeout')</div>'))
};
xhr.onreadystatechange = function () {
if (xhr.readyState === XMLHttpRequest.DONE) {
if (xhr.status === 200) {
$('#install-user-button').removeClass('disabled');
}
if (xhr.readyState === XMLHttpRequest.DONE && xhr.status === 200 && !migrate_error) {
$('#install-user-button').removeClass('disabled');
}
};
xhr.send();
</script>
@endsection
@section('style')
<style type="text/css">
label[for=db-update] {
font-size: large;
}
#db-update {
resize:vertical;
}
#retry-btn {
display: none;
}
</style>
@endsection