From 21f702c9ef4fa148cafe789747b8357403a25ed9 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Sat, 8 Oct 2016 21:55:49 +0200
Subject: [PATCH] Fixed videos query for player page
---
server.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/server.py b/server.py
index 7e4da7c..7e58deb 100644
--- a/server.py
+++ b/server.py
@@ -224,12 +224,11 @@ def lecture(id):
videos = query('''
SELECT videos.*, (videos.downloadable AND courses.downloadable) as downloadable, formats.description AS format_description, formats.player_prio, formats.prio
FROM videos
- JOIN lectures ON (videos.lecture_id = lectures.id)
JOIN formats ON (videos.video_format = formats.id)
- JOIN courses ON (lectures.course_id = courses.id)
- WHERE lectures.course_id= ? AND (? OR videos.visible)
- ORDER BY lectures.time, formats.prio DESC
- ''', lecture['course_id'], ismod())
+ JOIN courses ON (courses.id = ?)
+ WHERE videos.lecture_id = ? AND (? OR videos.visible)
+ ORDER BY formats.prio DESC
+ ''', lecture['course_id'], lecture['id'], ismod())
if not videos:
flash('Zu dieser Vorlesung wurden noch keine Videos veröffentlicht!')
course = query('SELECT * FROM courses WHERE id = ? AND (? OR (visible AND listed))', lecture['course_id'], ismod())
--
GitLab