added conditional to addition of welcome messages on log in: do not welcome blocked students

fe3ffaf2 · Daniel W Bond · 92cf7743 · fe3ffaf2
Commit fe3ffaf2 authored Jun 20, 2017 by Daniel W Bond
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

roomlist/core/utils.py roomlist/core/utils.py +4 -2

No files found.
--- a/roomlist/core/utils.py
+++ b/roomlist/core/utils.py
@@ -34,8 +34,10 @@ def custom_cas_login(request, *args, **kwargs):
            elif not request.user.completedSocial:
                return HttpResponseRedirect(reverse('welcomeSocial'))
        else:
-            welcome_back = random.choice(return_messages)
-            messages.add_message(request, messages.INFO, mark_safe(welcome_back))
+            # do not 'welcome back' blocked users
+            if not request.user.student.blocked:
+                welcome_back = random.choice(return_messages)
+                messages.add_message(request, messages.INFO, mark_safe(welcome_back))

    return response