From e667553df2ab1b352b5ddbca9d948cb001586ce4 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Wed, 2 Mar 2022 13:19:34 +0000
Subject: [PATCH] =?UTF-8?q?Resolve=20"Frageb=C3=B6gen=20zu=20fr=C3=BCh=20s?=
=?UTF-8?q?ichtbar"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/questionnaire.php | 2 +-
lib/models/Questionnaire.php | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/controllers/questionnaire.php b/app/controllers/questionnaire.php
index f407c071a2d..895dd16743e 100644
--- a/app/controllers/questionnaire.php
+++ b/app/controllers/questionnaire.php
@@ -622,7 +622,7 @@ class QuestionnaireController extends AuthenticatedController
if ($one->isStopped() && $one->resultsVisible()) {
$stopped_visible++;
}
- if ($one->isStopped() && (!$one->resultsVisible() || !Request::get("questionnaire_showall"))) {
+ if (($one->isStopped() || !$one->isViewable()) && (!$one->resultsVisible() || !Request::get("questionnaire_showall"))) {
unset($this->questionnaire_data[$i]);
continue;
}
diff --git a/lib/models/Questionnaire.php b/lib/models/Questionnaire.php
index 486db17b9d0..7483483df59 100644
--- a/lib/models/Questionnaire.php
+++ b/lib/models/Questionnaire.php
@@ -85,6 +85,9 @@ class Questionnaire extends SimpleORMap implements PrivacyObject
if ($this->isEditable()) {
return true;
}
+ if (!$this->isStarted()) {
+ return false;
+ }
foreach ($this->assignments as $assignment) {
if ($assignment['range_id'] === "public") {
return true;
--
GitLab