Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3179 from pterodactyl/fix/backup-restore

Browse source 
fix: backup restore delete all files
This commit is contained in:
Dane Everitt 2021-03-21 10:22:10 -07:00 committed by GitHub
commit 84e3153e71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/Client/Servers/BackupController.php
View file

@ -213,7 +213,7 @@ class BackupController extends ClientApiController
// actions against it via the Panel API. // actions against it via the Panel API.
$server->update(['status' => Server::STATUS_RESTORING_BACKUP]); $server->update(['status' => Server::STATUS_RESTORING_BACKUP]);
$this->repository->setServer($server)->restore($backup, $url ?? null, $request->input('truncate') === 'true'); $this->repository->setServer($server)->restore($backup, $url ?? null, $request->input('truncate'));
}); });
return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT); return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);

6
resources/scripts/api/server/backups/index.ts
View file

@ -1,5 +1,7 @@
import http from '@/api/http'; import http from '@/api/http';
export const restoreServerBackup = async (uuid: string, backup: string): Promise<void> => { export const restoreServerBackup = async (uuid: string, backup: string, truncate?: boolean): Promise<void> => {
await http.post(`/api/client/servers/${uuid}/backups/${backup}/restore`); await http.post(`/api/client/servers/${uuid}/backups/${backup}/restore`, {
truncate,
});
}; };

5
resources/scripts/components/server/backups/BackupContextMenu.tsx
View file

@ -25,6 +25,7 @@ export default ({ backup }: Props) => {
const setServerFromState = ServerContext.useStoreActions(actions => actions.server.setServerFromState); const setServerFromState = ServerContext.useStoreActions(actions => actions.server.setServerFromState);
const [ modal, setModal ] = useState(''); const [ modal, setModal ] = useState('');
const [ loading, setLoading ] = useState(false); const [ loading, setLoading ] = useState(false);
const [ truncate, setTruncate ] = useState(false);
const { clearFlashes, clearAndAddHttpError } = useFlash(); const { clearFlashes, clearAndAddHttpError } = useFlash();
const { mutate } = getServerBackups(); const { mutate } = getServerBackups();
@ -62,7 +63,7 @@ export default ({ backup }: Props) => {
const doRestorationAction = () => { const doRestorationAction = () => {
setLoading(true); setLoading(true);
clearFlashes('backups'); clearFlashes('backups');
restoreServerBackup(uuid, backup.uuid) restoreServerBackup(uuid, backup.uuid, truncate)
.then(() => setServerFromState(s => ({ .then(() => setServerFromState(s => ({
...s, ...s,
status: 'restoring_backup', status: 'restoring_backup',
@ -108,6 +109,8 @@ export default ({ backup }: Props) => {
css={tw`text-red-500! w-5! h-5! mr-2`} css={tw`text-red-500! w-5! h-5! mr-2`}
id={'restore_truncate'} id={'restore_truncate'}
value={'true'} value={'true'}
checked={truncate}
onChange={() => setTruncate(s => !s)}
/> />
Remove all files and folders before restoring this backup. Remove all files and folders before restoring this backup.
</label> </label>