nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 16:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

v1.7 alpha.4

Browse Source
This commit is contained in:
carodej
2020-07-15 11:50:32 +02:00
parent 25d15390ef
commit 6b36480097
15 changed files with 222 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/UserController.php
View File

@@ -212,6 +212,10 @@ class UserController extends Controller
{
$user = User::findOrFail($id);
if ($user->subscribed('main')) {
abort(202, 'You can\'t delete this account while user have active subscription.');
}
// Demo preview
if (env('APP_DEMO')) {
return response('Done!', 204);

3
app/Http/Controllers/AppFunctionsController.php
View File

@@ -56,9 +56,10 @@ class AppFunctionsController extends Controller
// Check settings table
$settings_table = Schema::hasTable('settings');
$users_table = Schema::hasTable('users');
// If settings table don't exist, then run migrations
if (! $settings_table) {
if ($users_table && ! $settings_table) {
Artisan::call('migrate');
}

14
app/Http/Controllers/General/SetupWizardController.php
View File

@@ -109,13 +109,9 @@ class SetupWizardController extends Controller
setEnvironmentValue($col['name'], $col['value']);
});
// Set database connection
config(['database.connections.mysql.driver' => $request->connection]);
config(['database.connections.mysql.host' => $request->host]);
config(['database.connections.mysql.port' => $request->port]);
config(['database.connections.mysql.database' => $request->name]);
config(['database.connections.mysql.username' => $request->username]);
config(['database.connections.mysql.password' => $request->password]);
// Clear cache
//Artisan::call('config:clear');
Artisan::call('config:cache');
// Set up application
$this->set_up_application();
@@ -126,10 +122,6 @@ class SetupWizardController extends Controller
'value' => 1,
]);
// Clear cache
//Artisan::call('config:clear');
Artisan::call('config:cache');
return response('Done', 200);
}