Skip to content
Snippets Groups Projects
Commit 51c2768d authored by Andreas Valder's avatar Andreas Valder
Browse files

fixed pagination for jobs

parent cda90899
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,6 @@ def jobs_overview(): ...@@ -15,7 +15,6 @@ def jobs_overview():
pagesize = min(500, int(request.args['pagesize'])) pagesize = min(500, int(request.args['pagesize']))
else: else:
pagesize = 50 pagesize = 50
pagecount = math.ceil(query('SELECT count(id) as count FROM jobs')[0]['count']/pagesize)
worker = query('SELECT * FROM worker ORDER BY last_ping DESC') worker = query('SELECT * FROM worker ORDER BY last_ping DESC')
...@@ -31,6 +30,7 @@ def jobs_overview(): ...@@ -31,6 +30,7 @@ def jobs_overview():
'state': request.args.get('state','failed'), 'state': request.args.get('state','failed'),
'worker': request.args.get('worker','%') } 'worker': request.args.get('worker','%') }
pagecount = math.ceil(query('SELECT count(id) as count FROM jobs WHERE (type like ?) AND (worker like ? OR (worker IS NULL AND ? = "%")) AND (state like ?)', filter['type'], filter['worker'], filter['worker'], filter['state'])[0]['count']/pagesize)
jobs = query('SELECT * FROM jobs WHERE (type like ?) AND (worker like ? OR (worker IS NULL AND ? = "%")) AND (state like ?) ORDER BY `time_created` DESC LIMIT ? OFFSET ?', filter['type'], filter['worker'], filter['worker'], filter['state'], pagesize, page*pagesize) jobs = query('SELECT * FROM jobs WHERE (type like ?) AND (worker like ? OR (worker IS NULL AND ? = "%")) AND (state like ?) ORDER BY `time_created` DESC LIMIT ? OFFSET ?', filter['type'], filter['worker'], filter['worker'], filter['state'], pagesize, page*pagesize)
return render_template('jobs_overview.html',worker=worker,jobs=jobs, filter_values=filter_values, filter=filter, page=page, pagesize=pagesize, pagecount=pagecount) return render_template('jobs_overview.html',worker=worker,jobs=jobs, filter_values=filter_values, filter=filter, page=page, pagesize=pagesize, pagecount=pagecount)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment