diff --git a/jobs.py b/jobs.py index cd86ecb51b13348b5b0aefa5376ce0b9001717fb..435da737eb1fdcadc9462d01c7cb977d66bcdcd6 100644 --- a/jobs.py +++ b/jobs.py @@ -41,12 +41,15 @@ def jobs_overview(): @csrf_protect def jobs_action(action, jobid=None): if action == 'clear_failed': - query('UPDATE jobs SET state="deleted" WHERE state = "failed" AND (id = ? OR ? IS NULL)',jobid, jobid) + query('UPDATE jobs SET state="deleted" WHERE state = "failed" AND (id = ? OR ? IS NULL)', jobid, jobid) if action == 'retry_failed': query('UPDATE jobs SET state="ready" WHERE state = "failed" AND (id = ? OR ? IS NULL)', jobid, jobid) if action == 'copy': if jobid: query("INSERT INTO jobs SELECT NULL, type, priority, 'ready', '', '' , ?, '', NULL, data, '{}' FROM jobs where ID=?;", datetime.now(), jobid) + if action == 'delete': + if jobid: + query('UPDATE jobs SET state="deleted" WHERE id = ?', jobid) if action == 'add': jobtype = request.values.get('type', None) if jobtype == 'thumbnail': diff --git a/templates/jobs_overview.html b/templates/jobs_overview.html index f3c450a0cbc35ba940f3f56fc9695e501366c165..9cdd5e1cae86e11ab5313d5cf091dc2b0d98dd9a 100644 --- a/templates/jobs_overview.html +++ b/templates/jobs_overview.html @@ -177,18 +177,31 @@ <td>{{i.data}}</td> <td>{{i.status}}</td> <td> + <ul class="list-inline" style="white-space: nowrap;"> {% if i.state == "failed" %} - <a class="btn btn-default" href="{{url_for('jobs_action', action='clear_failed', jobid=i.id, ref=request.url)}}" title="Löschen" style="background-color: red;"> - <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> - </a> - <a class="btn btn-default" href="{{url_for('jobs_action', action='retry_failed', jobid=i.id, ref=request.url)}}" title="Neustarten"> - <span class="fa fa-refresh" aria-hidden="true"></span> - </a> + <li> + <a class="btn btn-default" href="{{url_for('jobs_action', action='clear_failed', jobid=i.id, ref=request.url)}}" title="Löschen" style="background-color: red;"> + <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> + </a> + </li> + <li> + <a class="btn btn-default" href="{{url_for('jobs_action', action='retry_failed', jobid=i.id, ref=request.url)}}" title="Neustarten"> + <span class="fa fa-refresh" aria-hidden="true"></span> + </a> + </li> {% else %} - <a class="btn btn-default" href="{{url_for('jobs_action', action='copy', jobid=i.id, ref=request.url)}}" title="Kopie neu einreihen"> - <span class="fa fa-refresh" aria-hidden="true"></span> - </a> + <li> + <a class="btn btn-default" href="{{url_for('jobs_action', action='delete', jobid=i.id, ref=request.url)}}" title="Löschen" style="background-color: red;"> + <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> + </a> + </li> + <li> + <a class="btn btn-default" href="{{url_for('jobs_action', action='copy', jobid=i.id, ref=request.url)}}" title="Kopie neu einreihen"> + <span class="fa fa-refresh" aria-hidden="true"></span> + </a> + </li> {% endif %} + </ul> </td> </tr> {% endfor %}