Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 17 Pull requests Projects Releases 12 Packages Wiki Activity Actions

minor v1.3.0 #57

Merged
jkeffects merged 10 commits from develop into main 2025-02-03 12:51:59 +00:00
Conversation 0 Commits 10 Files changed 37 +14 -9
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a24f8b7153 - Show all commits

23
src/components/admin/user/backup/RestoreBackupModal.vue
View file

@ -5,7 +5,7 @@
</div> </div>
<br /> <br />
<form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreateBackup"> <form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreateBackup">
<div class="flex flex-row items-center gap-2"> <!-- <div class="flex flex-row items-center gap-2">
<input type="checkbox" id="partial" v-model="partial" /> <input type="checkbox" id="partial" v-model="partial" />
<label for="partial">Backup vollständig laden</label> <label for="partial">Backup vollständig laden</label>
</div> </div>
@ -18,14 +18,16 @@
<div v-if="!partial" class="flex flex-row items-center gap-2"> <div v-if="!partial" class="flex flex-row items-center gap-2">
<input type="checkbox" id="overwrite" checked /> <input type="checkbox" id="overwrite" checked />
<label for="overwrite">Daten entfernen und importieren</label> <label for="overwrite">Daten entfernen und importieren</label>
</div> </div> -->
<p>Backups ersetzen den aktuellen Stand vollständig.</p>
<br /> <br />
<p class="flex"> <!-- <p class="flex">
<InformationCircleIcon class="min-h-5 h-5 min-w-5 w-5" />Je nach Auswahl, werden die entsprechenden <InformationCircleIcon class="min-h-5 h-5 min-w-5 w-5" />Je nach Auswahl, werden die entsprechenden
Bestandsdaten ersetzt. Dadurch können Daten, die seit diesem Backup erstellt wurden, verloren gehen. Bestandsdaten ersetzt. Dadurch können Daten, die seit diesem Backup erstellt wurden, verloren gehen.
</p> </p>
<p class="flex">Das Laden eines vollständigen Backups wird zur Vermeidung von Inkonsistenzen empfohlen.</p> <p class="flex">Das Laden eines vollständigen Backups wird zur Vermeidung von Inkonsistenzen empfohlen.</p> -->
<div class="flex flex-row gap-2"> <div class="flex flex-row gap-2">
<button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'"> <button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">
@ -84,11 +86,14 @@ export default defineComponent({
let formData = e.target.elements; let formData = e.target.elements;
let restoreBackup: BackupRestoreViewModel = { let restoreBackup: BackupRestoreViewModel = {
filename: this.data, filename: this.data,
partial: !formData.partial.checked, partial: false,
include: Array.from(formData?.sections?.selectedOptions ?? []).map( include: [],
(t) => (t as HTMLOptionElement).value overwrite: false,
) as Array<BackupSection>, // partial: !formData.partial.checked,
overwrite: !formData?.overwrite.checked, // include: Array.from(formData?.sections?.selectedOptions ?? []).map(
// (t) => (t as HTMLOptionElement).value
// ) as Array<BackupSection>,
// overwrite: !formData?.overwrite.checked,
}; };
this.status = "loading"; this.status = "loading";
this.restoreBackup(restoreBackup) this.restoreBackup(restoreBackup)