From 09175738d463570b08d6ffaed6b36b637dfe59c9 Mon Sep 17 00:00:00 2001
From: hamza mahjoubi <hamzamahjoubi221@gmail.com>
Date: Sat, 9 Dec 2023 16:55:25 +0100
Subject: [PATCH] fixup! Save a Single Question as csv

Signed-off-by: hamza mahjoubi <hamzamahjoubi221@gmail.com>
---
 appinfo/routes.php                        | 4 ++--
 lib/Controller/ApiController.php          | 6 +++---
 src/components/Results/ResultsSummary.vue | 2 +-
 src/components/Results/Submission.vue     | 2 +-
 src/views/Results.vue                     | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index add1a5dc6..747563775 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -296,7 +296,7 @@
 			'url' => '/api/{apiVersion}/submissions/exportQuestion/{questionId}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v2'
+				'apiVersion' => 'v2.2'
 			]
 		],
 		[
@@ -304,7 +304,7 @@
 			'url' => '/api/{apiVersion}/submissions/exportSubmission/{submissionId}',
 			'verb' => 'GET',
 			'requirements' => [
-				'apiVersion' => 'v2'
+				'apiVersion' => 'v2.2'
 			]
 		],
 		[
diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index 6657a6547..355c6758e 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -1121,8 +1121,8 @@ public function exportQuestion(int $questionId): DataDownloadResponse {
 			throw new OCSBadRequestException();
 		}
 
-		if ($form->getOwnerId() !== $this->currentUser->getUID()) {
-			$this->logger->debug('This form is not owned by the current user');
+		if (!$this->formsService->canSeeResults($form)) {
+			$this->logger->debug('The current user has no permission to get the results for this form');
 			throw new OCSForbiddenException();
 		}
 
@@ -1154,7 +1154,7 @@ public function exportSubmission(int $submissionId): DataDownloadResponse {
 			throw new OCSBadRequestException();
 		}
 
-		if (!$this->formsService->canSeeResults($form->id)) {
+		if (!$this->formsService->canSeeResults($form)) {
 			$this->logger->debug('The current user has no permission to get the results for this form');
 			throw new OCSForbiddenException();
 		}
diff --git a/src/components/Results/ResultsSummary.vue b/src/components/Results/ResultsSummary.vue
index 435985e43..421f2c63c 100644
--- a/src/components/Results/ResultsSummary.vue
+++ b/src/components/Results/ResultsSummary.vue
@@ -199,7 +199,7 @@ export default {
 			return textAnswers
 		},
 		questionDownload() {
-			return generateOcsUrl('apps/forms/api/v2/submissions/exportQuestion/{questionId}', { questionId: this.question.id })
+			return generateOcsUrl('apps/forms/api/v2.2/submissions/exportQuestion/{questionId}', { questionId: this.question.id })
 		},
 	},
 }
diff --git a/src/components/Results/Submission.vue b/src/components/Results/Submission.vue
index 310884b28..967c11bef 100644
--- a/src/components/Results/Submission.vue
+++ b/src/components/Results/Submission.vue
@@ -92,7 +92,7 @@ export default {
 
 	computed: {
 		responseDownload() {
-			return generateOcsUrl('apps/forms/api/v2/submissions/exportSubmission/{submissionId}', { submissionId: this.submission.id })
+			return generateOcsUrl('apps/forms/api/v2.2/submissions/exportSubmission/{submissionId}', { submissionId: this.submission.id })
 		},
 
 		// Format submission-timestamp to DateTime
diff --git a/src/views/Results.vue b/src/views/Results.vue
index 6b333312a..49a32ab7d 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -168,7 +168,6 @@ import PermissionTypes from '../mixins/PermissionTypes.js'
 
 const picker = getFilePickerBuilder(t('forms', 'Save CSV to Files'))
 	.setMultiSelect(false)
-	.setModal(true)
 	.setType(1)
 	.allowDirectories()
 	.build()