FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix database connection test in installer

Browse Source
This commit is contained in:
Nabeel Shahzad 2018-03-20 09:29:45 -05:00
parent 273ccc648d
commit 06e1cd15c0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/Installer/Resources/views/app.blade.php
View File

@ -5,7 +5,10 @@
<meta charset="utf-8"/> <meta charset="utf-8"/>
<link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png"> <link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
<link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png"> <link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>@yield('title') - installer</title> <title>@yield('title') - installer</title>
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
name='viewport'/> name='viewport'/>

16
modules/Installer/Resources/views/install/steps/step2-db.blade.php
View File

@ -123,18 +123,20 @@ function changeForm(selected) {
$("tbody#" + selected + "_settings").show(); $("tbody#" + selected + "_settings").show();
} }
$(document).ready(function() { $(document).ready(() => {
var selValue = $("#db_conn option:selected").text();
const selValue = $("#db_conn option:selected").text();
changeForm(selValue); changeForm(selValue);
$("#db_conn").change(function(e) { $("#db_conn").change((e) => {
var selValue = $("#db_conn option:selected").text(); const selValue = $("#db_conn option:selected").text();
changeForm(selValue); changeForm(selValue);
}); });
$("#dbtest_button").click(function(e) { $("#dbtest_button").click((e) => {
e.preventDefault(); e.preventDefault();
var opts = { const opts = {
_token: "{{ csrf_token() }}",
db_conn: $("#db_conn option:selected").text(), db_conn: $("#db_conn option:selected").text(),
db_host: $("input[name=db_host]").val(), db_host: $("input[name=db_host]").val(),
db_port: $("input[name=db_port]").val(), db_port: $("input[name=db_port]").val(),
@ -143,7 +145,7 @@ $(document).ready(function() {
db_pass: $("input[name=db_pass]").val(), db_pass: $("input[name=db_pass]").val(),
}; };
$.post("{{ route('installer.dbtest') }}", opts, function(data) { $.post("{{ route('installer.dbtest') }}", opts, (data) => {
$("#dbtest").html(data); $("#dbtest").html(data);
}) })
}) })