Skip to content

Commit d65c330

Browse files
authored
Merge pull request #87 from opensafely-core/messages
Add minimal alert messages
2 parents b5b630d + 4539eea commit d65c330

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

@@ -233,6 +235,7 @@ def request_submit(request, request_id):
233235
except api.RequestPermissionDenied as exc:
234236
raise PermissionDenied(str(exc))
235237

238+
messages.success(request, "Request has been submitted")
236239
return redirect(release_request.get_absolute_url())
237240

238241

@@ -245,6 +248,7 @@ def request_reject(request, request_id):
245248
except api.RequestPermissionDenied as exc:
246249
raise PermissionDenied(str(exc))
247250

251+
messages.error(request, "Request has been rejected")
248252
return redirect(release_request.get_absolute_url())
249253

250254

@@ -273,4 +277,5 @@ def request_release_files(request, request_id):
273277
raise PermissionDenied() from None
274278
raise
275279

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

0 commit comments

Comments
 (0)