QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-19 11:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #576 from csalzano/fix/remote-disk-backup-listing

Browse Source 
Fix remote disk backups never appear in backup listing
This commit is contained in:
mchev
2026-03-26 09:16:13 +01:00
committed by GitHub
parent 7e8f9e65fb 14b5aaa0c9
commit 3bae2c282c
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/V1/Admin/Backup/BackupsController.php
View File

@@ -5,6 +5,7 @@
namespace App\Http\Controllers\V1\Admin\Backup; namespace App\Http\Controllers\V1\Admin\Backup;
use App\Jobs\CreateBackupJob; use App\Jobs\CreateBackupJob;
use App\Models\FileDisk;
use App\Rules\Backup\PathToZip; use App\Rules\Backup\PathToZip;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -27,6 +28,16 @@ class BackupsController extends ApiController
$configuredBackupDisks = config('backup.backup.destination.disks'); $configuredBackupDisks = config('backup.backup.destination.disks');
try { try {
if ($request->file_disk_id) {
$fileDisk = FileDisk::find($request->file_disk_id);
if ($fileDisk) {
$fileDisk->setConfig();
$prefix = env('DYNAMIC_DISK_PREFIX', 'temp_');
config(['backup.backup.destination.disks' => [$prefix.$fileDisk->driver]]);
$configuredBackupDisks = config('backup.backup.destination.disks');
}
}
$backupDestination = BackupDestination::create(config('filesystems.default'), config('backup.backup.name')); $backupDestination = BackupDestination::create(config('filesystems.default'), config('backup.backup.name'));
$backups = Cache::remember("backups-{$request->file_disk_id}", now()->addSeconds(4), function () use ($backupDestination) { $backups = Cache::remember("backups-{$request->file_disk_id}", now()->addSeconds(4), function () use ($backupDestination) {

4
resources/scripts/admin/views/settings/BackupSetting.vue
View File

@@ -167,14 +167,14 @@ async function loadDisksData() {
let res = await diskStore.fetchDisks({ limit: 'all' }) let res = await diskStore.fetchDisks({ limit: 'all' })
if (res.data.error) { if (res.data.error) {
} }
filters.selected_disk = res.data.data.find((disk) => disk.set_as_default == 0) filters.selected_disk = res.data.data.find((disk) => disk.set_as_default == 1) ?? res.data.data[0]
isFetchingInitialData.value = false isFetchingInitialData.value = false
} }
async function fetchBackupsData({ page, filter, sort }) { async function fetchBackupsData({ page, filter, sort }) {
let data = { let data = {
disk: filters.selected_disk.driver, disk: filters.selected_disk.driver,
filed_disk_id: filters.selected_disk.id, file_disk_id: filters.selected_disk.id,
} }
isFetchingInitialData.value = true isFetchingInitialData.value = true

4
tests/Feature/Admin/BackupTest.php
View File

@@ -50,9 +50,11 @@ test('create backup', function () {
$response = getJson("/api/v1/backups?disk={$disk->driver}&&file_disk_id={$disk->id}"); $response = getJson("/api/v1/backups?disk={$disk->driver}&&file_disk_id={$disk->id}");
$prefix = env('DYNAMIC_DISK_PREFIX', 'temp_');
$response->assertStatus(200)->assertJson([ $response->assertStatus(200)->assertJson([
'disks' => [ 'disks' => [
'local', $prefix.$disk->driver,
], ],
]); ]);
}); });