diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-06-21 13:50:40 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-06-21 13:50:40 +0300 |
| commit | 9522d31e9d46be1e9e169a7b6e27229af81aa86b (patch) | |
| tree | 56725137983f263cc32def80bae21f5d64b5469a /lib | |
| parent | 3067a8b33aeae361e1d47de586d96e8e68d3b96b (diff) | |
Sync documents before handling conflicts
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Service/ApiService.php | 7 | ||||
| -rw-r--r-- | lib/Service/DocumentService.php | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/Service/ApiService.php b/lib/Service/ApiService.php index 351e8fe89..8ff6ddcd5 100644 --- a/lib/Service/ApiService.php +++ b/lib/Service/ApiService.php @@ -160,7 +160,10 @@ class ApiService { $file = $this->documentService->getFileById($documentId); } return new DataResponse([ - 'outsideChange' => $file->getContent() + 'outsideChange' => $file->getContent(), + 'steps' => $this->documentService->getSteps($documentId, $version), + 'sessions' => $this->sessionService->getActiveSessions($documentId), + 'document' => $this->documentService->get($documentId) ], 409); } catch (Exception $e) { return new DataResponse([ @@ -171,7 +174,7 @@ class ApiService { return new DataResponse([ 'steps' => $this->documentService->getSteps($documentId, $version), 'sessions' => $this->sessionService->getActiveSessions($documentId), - 'document' => $document + 'document' => $document ?? $document = $this->documentService->get($documentId) ]); } diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php index 513b4116b..e35898f77 100644 --- a/lib/Service/DocumentService.php +++ b/lib/Service/DocumentService.php @@ -161,6 +161,10 @@ class DocumentService { return $this->appData->getFolder('documents')->getFile($document); } + public function get($documentId) { + return $this->documentMapper->find($documentId); + } + /** * @param $documentId * @param $sessionId |