sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v18.5.14'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-05-22 12:11:19 +02:00
parent 5b88dce3f9 adf1002809
commit 8f21381b32
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/uploads.py
View File

@@ -87,7 +87,7 @@ def make_plot(r, w, f1, f2, plottype, title, imagename='', plotnr=0):
}
axis = r.staticgrids
if axis is None: # pragma: no cover
if axis is None or axis.lower() == 'none': # pragma: no cover
gridtrue = False
axis = 'both'
else:

13
rowers/views/otherviews.py
View File

@@ -38,11 +38,14 @@ def failed_queue_view(request):
if not request.user.is_staff: # pragma: no cover
raise PermissionDenied("Not Allowed")
q = Queue('failed', connection=Redis())
q = Queue(connection=Redis())
registry = q.failed_job_registry
resultslist = []
for job in q.jobs: # pragma: no cover
for id in registry.get_job_ids(): # pragma: no cover
job = Job.fetch(id,connection=Redis())
traceback = str(job.exc_info)
info = {
@@ -66,9 +69,11 @@ def failed_queue_empty(request):
if not request.user.is_staff: # pragma: no cover
raise PermissionDenied("Not Allowed")
q = Queue('failed', connection=Redis())
q = Queue(connection=Redis())
registry = q.failed_job_registry
q.empty()
for id in registry.get_job_ids():
registry.remove(id,delete_job=True)
return HttpResponseRedirect(reverse('failed_queue_view'))