Skip to content
Snippets Groups Projects
Commit 62e628d5 authored by Simon Künzel's avatar Simon Künzel
Browse files

Fix cutprogress and job worker filter sql

parent 330b744c
No related branches found
No related tags found
No related merge requests found
...@@ -40,8 +40,8 @@ def cutprogress(user=None): ...@@ -40,8 +40,8 @@ def cutprogress(user=None):
lectures.course_id, lectures.course_id,
lectures.time, lectures.time,
lectures.title, lectures.title,
video_counts.videos_total, COALESCE(video_counts.videos_total, 0),
video_counts.videos_visible COALESCE(video_counts.videos_visible, 0)
FROM lectures FROM lectures
JOIN courses ON ( courses.id = lectures.course_id ) JOIN courses ON ( courses.id = lectures.course_id )
LEFT JOIN ( LEFT JOIN (
......
...@@ -27,7 +27,7 @@ def jobs_overview(): ...@@ -27,7 +27,7 @@ def jobs_overview():
condition_values = [] condition_values = []
if filter['worker'] == '%': if filter['worker'] == '%':
condition = 'WHERE (type like ?) AND (worker IS NULL) AND (state like ?)' condition = 'WHERE (type like ?) AND (state like ?)'
condition_values.extend([filter['type'], filter['state']]) condition_values.extend([filter['type'], filter['state']])
else: else:
condition = 'WHERE (type like ?) AND (worker like ?) AND (state like ?)' condition = 'WHERE (type like ?) AND (worker like ?) AND (state like ?)'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment