QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-07 13:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(backup): remote disk backups never appear in backup listing

Browse Source 
Three bugs prevented backups stored on remote disks (Dropbox, S3, etc.)
from ever appearing in the Settings > Backup listing:

1. Typo in BackupSetting.vue: `filed_disk_id` was sent to the API
   instead of `file_disk_id`, so the backend never received the selected
   disk ID and always fell back to the local filesystem.

2. Wrong default disk selection in loadDisksData(): `set_as_default == 0`
   selected the first disk that is NOT default (local_public), instead of
   the disk that IS default. Changed to `set_as_default == 1` with a
   fallback to the first disk.

3. BackupsController::index() did not call setConfig() on the FileDisk
   before querying backups, so even when the correct file_disk_id arrived
   it still read from the default local filesystem. Added the same disk
   bootstrap logic already present in CreateBackupJob and destroy().

Made-with: Cursor
This commit is contained in:
Corey Salzano
2026-03-17 19:32:40 -04:00
parent 48abd9020d
commit 3c31baf20d
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,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 = \App\Models\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