daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-05-30 15:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7722 from nextcloud/enh/7664/backup-test

Browse Source 
DockerController: refactor `StartBackupContainerTest` to show the stopping and starting state
This commit is contained in:
Simon L.
2026-03-12 16:01:09 +01:00
committed by GitHub
parent eda48383b4 7f394f5297
commit a7703283dc
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
php/src/Controller/DockerController.php
View File

@@ -168,13 +168,19 @@ readonly class DockerController {
$this->configurationManager->instanceRestoreAttempt = false;
$this->configurationManager->commitTransaction();
// Get streaming response start and closure
$nonbufResp = $this->startStreamingResponse($response);
$addToStreamingResponseBody = $this->getAddToStreamingResponseBody($nonbufResp);
$id = self::TOP_CONTAINER;
$this->PerformRecursiveContainerStop($id);
$this->PerformRecursiveContainerStop($id, true, $addToStreamingResponseBody);
$id = 'nextcloud-aio-borgbackup';
$this->PerformRecursiveContainerStart($id);
$this->PerformRecursiveContainerStart($id, true, $addToStreamingResponseBody);
return $response->withStatus(201)->withHeader('Location', '.');
// End streaming response
$this->finalizeStreamingResponse($nonbufResp);
return $nonbufResp;
}
public function StartContainer(Request $request, Response $response, array $args) : Response

2
php/templates/containers.twig
View File

@@ -215,7 +215,7 @@
{% endif %}
{% else %}
<p><strong>Everything set!</strong> Click on the button below to test the path and encryption password:</p>
<form method="POST" action="api/docker/backup-test" class="xhr">
<form method="POST" action="api/docker/backup-test" target="overlay-log">
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input type="submit" value="Test path and encryption password"/>