From 926e2e7ef746fffef4d42e5a28c1ff78246dfa00 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Sun, 11 Mar 2018 03:20:43 +0100
Subject: [PATCH] Also show public documents to privileged users
---
models/database.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/models/database.py b/models/database.py
index 69f2bde..b9f64aa 100644
--- a/models/database.py
+++ b/models/database.py
@@ -376,7 +376,6 @@ class Protocol(DatabaseModel):
candidates = [
document for document in self.documents
if document.is_compiled
- and (private is None or document.is_private == private)
]
private_candidates = [
document for document in candidates
@@ -386,10 +385,14 @@ class Protocol(DatabaseModel):
document for document in candidates
if not document.is_private
]
- if len(private_candidates) > 0:
- return private_candidates[0]
- elif len(public_candidates) > 0:
- return public_candidates[0]
+
+ def _get_candidates():
+ if private is None or private:
+ return private_candidates + public_candidates
+ return public_candidates
+ candidates = _get_candidates()
+ if candidates:
+ return candidates[0]
return None
def get_template(self):
--
GitLab