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

step status refactor

Browse Source
This commit is contained in:
Tony Murray
2020-06-21 01:07:56 -05:00
parent d1ceb14b9a
commit e267ec1cab
6 changed files with 72 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,9 +36,14 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
class DatabaseController extends InstallationController implements InstallerStep
{
const KEYS = ['host', 'username', 'password', 'database', 'port', 'unix_socket'];
protected $step = 'database';
public function index(Request $request)
{
if (!$this->initInstallStep()) {
return $this->redirectToIncomplete();
}
$data = Arr::only(session()->get('db') ?: [], self::KEYS);
$data['valid_credentials'] = Eloquent::isConnected();
$data['migrated'] = session('install.database');
@@ -88,7 +93,7 @@ class DatabaseController extends InstallationController implements InstallerStep
throw new \RuntimeException('Migration failed');
}
echo "\n\nSuccess!";
$this->markStepComplete('database');
$this->markStepComplete();
} catch (\Exception $e) {
echo $e->getMessage() . "\n\nError!";
}
@@ -108,7 +113,7 @@ class DatabaseController extends InstallationController implements InstallerStep
$this->configureDatabase();
if (Eloquent::isConnected() && Schema::isCurrent()) {
$this->markStepComplete('database');
$this->markStepComplete();
return true;
}