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

Table prefixes not being added to indexes (#597)

Browse Source 
* Enabled prefixes on any created indexes (multi-site install in single db)

* Formatting

* Check if enum label is looking for a translation

* Return value

* Fix view namespace across modules
This commit is contained in:
Nabeel S
2020-02-28 18:56:01 -05:00
committed by GitHub
parent 2f40f4737c
commit b0f122a301
11 changed files with 103 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/Importer/Http/Controllers/ImporterController.php
View File

@@ -36,6 +36,18 @@ class ImporterController extends Controller
return view('importer::step1-configure');
}
protected function testDb(Request $request)
{
$this->dbSvc->checkDbConnection(
$request->post('db_conn'),
$request->post('db_host'),
$request->post('db_port'),
$request->post('db_name'),
$request->post('db_user'),
$request->post('db_pass')
);
}
/**
* Check the database connection
*
@@ -49,14 +61,7 @@ class ImporterController extends Controller
$message = 'Database connection looks good!';
try {
$this->dbSvc->checkDbConnection(
$request->post('db_conn'),
$request->post('db_host'),
$request->post('db_port'),
$request->post('db_name'),
$request->post('db_user'),
$request->post('db_pass')
);
$this->testDb($request);
} catch (\Exception $e) {
$status = 'danger';
$message = 'Failed! '.$e->getMessage();
@@ -78,6 +83,8 @@ class ImporterController extends Controller
public function config(Request $request)
{
try {
$this->testDb($request);
// Save the credentials to use later
$this->importerSvc->saveCredentialsFromRequest($request);