lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #12986 from snipe/features/import_backup_filename

Browse source 
Pass filename to pre-import backup
This commit is contained in:
snipe 2023-05-08 15:08:59 -07:00 • committed by GitHub
commit b76c5206ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/ImportController.php
View file

@ -160,7 +160,7 @@ class ImportController extends Controller
// Run a backup immediately before processing // Run a backup immediately before processing
if ($request->get('run-backup')) { if ($request->get('run-backup')) {
\Log::debug('Backup manually requested via importer'); \Log::debug('Backup manually requested via importer');
Artisan::call('backup:run'); Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H:i:s')]);
} else { } else {
\Log::debug('NO BACKUP requested via importer'); \Log::debug('NO BACKUP requested via importer');
} }

2
app/Http/Controllers/SettingsController.php
View file

@ -1094,7 +1094,7 @@ class SettingsController extends Controller
public function postBackups() public function postBackups()
{ {
if (! config('app.lock_passwords')) { if (! config('app.lock_passwords')) {
Artisan::call('backup:run'); Artisan::call('snipeit:backup', ['--filename' => 'manual-backup-'.date('Y-m-d-H:i:s')]);
$output = Artisan::output(); $output = Artisan::output();
// Backup completed // Backup completed