Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 06:44:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

prefix all db field with db_

Browse Source
This commit is contained in:
Benjamin Beganović 2020-12-08 14:21:00 +01:00
parent 3505c89e2d
commit 3ffb600117
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/Setup/CheckDatabaseRequest.php
View File

@ -34,9 +34,9 @@ class CheckDatabaseRequest extends Request
public function rules() public function rules()
{ {
return [ return [
'host' => ['required'], 'db_host' => ['required'],
'database' => ['required'], 'db_database' => ['required'],
'username' => ['required'], 'db_username' => ['required'],
]; ];
} }
} }

4
app/Http/Requests/Setup/StoreSetupRequest.php
View File

@ -31,8 +31,8 @@ class StoreSetupRequest extends Request
/*System*/ /*System*/
'url' => 'required', 'url' => 'required',
/*Database*/ /*Database*/
'host' => 'required', 'db_host' => 'required',
'database' => 'required', 'db_database' => 'required',
'db_username' => 'required', 'db_username' => 'required',
'db_password' => '', 'db_password' => '',
/*Mail driver*/ /*Mail driver*/

8
app/Utils/SystemHealth.php
View File

@ -161,10 +161,10 @@ class SystemHealth
$result = ['success' => false]; $result = ['success' => false];
if ($request && $request instanceof CheckDatabaseRequest) { if ($request && $request instanceof CheckDatabaseRequest) {
config(['database.connections.db-ninja-01.host'=> $request->input('host')]); config(['database.connections.db-ninja-01.host'=> $request->input('db_host')]);
config(['database.connections.db-ninja-01.database'=> $request->input('database')]); config(['database.connections.db-ninja-01.database'=> $request->input('db_database')]);
config(['database.connections.db-ninja-01.username'=> $request->input('username')]); config(['database.connections.db-ninja-01.username'=> $request->input('db_username')]);
config(['database.connections.db-ninja-01.password'=> $request->input('password')]); config(['database.connections.db-ninja-01.password'=> $request->input('db_password')]);
config(['database.default' => 'db-ninja-01']); config(['database.default' => 'db-ninja-01']);
DB::purge('db-ninja-01'); DB::purge('db-ninja-01');

8
resources/js/setup/setup.js vendored
View File

@ -24,10 +24,10 @@ class Setup {
handleDatabaseCheck() { handleDatabaseCheck() {
let data = { let data = {
host: document.querySelector('input[name="host"]').value, db_host: document.querySelector('input[name="db_host"]').value,
database: document.querySelector('input[name="database"]').value, db_database: document.querySelector('input[name="db_database"]').value,
username: document.querySelector('input[name="db_username"]').value, db_username: document.querySelector('input[name="db_username"]').value,
password: document.querySelector('input[name="db_password"]').value, db_password: document.querySelector('input[name="db_password"]').value,
}; };
Axios.post('/setup/check_db', data) Axios.post('/setup/check_db', data)

4
resources/views/setup/_database.blade.php
View File

@ -38,7 +38,7 @@ FLUSH PRIVILEGES;
{{ ctrans('texts.host') }}* {{ ctrans('texts.host') }}*
</dt> </dt>
<dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2"> <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
<input type="text" class="input w-full" name="host" required value="{{ old('host') ?: 'localhost'}}"> <input type="text" class="input w-full" name="db_host" required value="{{ old('host') ?: 'localhost'}}">
</dd> </dd>
</div> </div>
<div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center"> <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@ -46,7 +46,7 @@ FLUSH PRIVILEGES;
{{ ctrans('texts.database') }}* {{ ctrans('texts.database') }}*
</dt> </dt>
<dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2"> <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
<input type="text" class="input w-full" name="database" required value="{{ old('database') ?: 'db-ninja-01'}}"> <input type="text" class="input w-full" name="db_database" required value="{{ old('database') ?: 'db-ninja-01'}}">
</dd> </dd>
</div> </div>
<div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center"> <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">