Skip to content

Commit 4539eea

Browse files
committed
Add minimal alert messages
Add messages on adding a file, submitted a request for review, rejecting a request, and releasing files
1 parent e31e1f6 commit 4539eea

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

airlock/settings.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from pathlib import Path
1515

1616
import django.dispatch
17+
from django.contrib import messages
1718
from django.db.backends.signals import connection_created
1819

1920

@@ -233,3 +234,13 @@ def run_connection_init_queries(*, connection, **kwargs):
233234

234235
# BACKEND is global env var on backends
235236
BACKEND = os.environ.get("BACKEND", "test")
237+
238+
# Messages
239+
# https://docs.djangoproject.com/en/3.0/ref/contrib/messages/
240+
MESSAGE_TAGS = {
241+
messages.DEBUG: "alert-info",
242+
messages.INFO: "alert-info",
243+
messages.SUCCESS: "alert-success",
244+
messages.WARNING: "alert-warning",
245+
messages.ERROR: "alert-danger",
246+
}

airlock/views.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import requests
44
from django import forms
55
from django.conf import settings
6+
from django.contrib import messages
67
from django.core.exceptions import PermissionDenied
78
from django.http import Http404
89
from django.shortcuts import redirect
@@ -156,6 +157,7 @@ def workspace_add_file_to_request(request, workspace_name):
156157
release_request = api.get_current_request(workspace_name, request.user, create=True)
157158
api.add_file_to_request(release_request, relpath, request.user)
158159

160+
messages.success(request, "File has been added to request")
159161
# redirect to this just added file
160162
return redirect(release_request.get_url_for_path(relpath))
161163

@@ -221,6 +223,7 @@ def request_submit(request, request_id):
221223
except api.RequestPermissionDenied as exc:
222224
raise PermissionDenied(str(exc))
223225

226+
messages.success(request, "Request has been submitted")
224227
return redirect(release_request.get_absolute_url())
225228

226229

@@ -233,6 +236,7 @@ def request_reject(request, request_id):
233236
except api.RequestPermissionDenied as exc:
234237
raise PermissionDenied(str(exc))
235238

239+
messages.error(request, "Request has been rejected")
236240
return redirect(release_request.get_absolute_url())
237241

238242

@@ -261,4 +265,5 @@ def request_release_files(request, request_id):
261265
raise PermissionDenied() from None
262266
raise
263267

268+
messages.success(request, "Files have been released to jobs.opensafely.org")
264269
return redirect(release_request.get_absolute_url())

0 commit comments

Comments
 (0)