DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Check that the table exists

Browse source 
Should probably find a way to handle this that doesn't require a DB call
This commit is contained in:
snipe 2016-05-14 15:05:20 -07:00
parent 4dd3a95b6d
commit 1a14abed05
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Http/Middleware/CheckForSetup.php
View file

@ -5,6 +5,7 @@ namespace App\Http\Middleware;
use Closure; use Closure;
use Config; use Config;
use Route; use Route;
use Schema;
use App\Models\User; use App\Models\User;
class CheckForSetup class CheckForSetup
@ -13,12 +14,22 @@ class CheckForSetup
{ {
try { try {
$usercount = User::withTrashed()->count();
if (($usercount > 0) && (Route::is('setup*'))) { $users_table_exists = Schema::hasTable('users');
return redirect(config('app.url')); $settings_table_exists = Schema::hasTable('settings');
if ($users_table_exists && $settings_table_exists) {
$usercount = User::withTrashed()->count();
if (($usercount > 0) && (Route::is('setup*'))) {
return redirect(config('app.url'));
} else {
return $next($request);
}
} else { } else {
return $next($request); return $next($request);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
return $next($request); return $next($request);
} }