Merge branch 'master' of https://github.com/mitchellias/mchp-dev

mchp/lib/middleware.py

@@ -1,6 +1,7 @@
 import pytz
 
 from django.utils import timezone
+from django.contrib import messages
 
 class TimezoneMiddleware(object):
     # activate the current time zone for the student according to their school time zone
@@ -11,3 +12,14 @@ def process_request(self, request):
                 timezone.activate(pytz.timezone(tz))
             else:
                 timezone.deactivate()
+
+class CustomMessageMiddleware(object):
+
+    def process_request(self, request):
+        storage = messages.get_messages(request)
+        mes = []
+        # what = storage.inbox_list(request.user)
+        for message in storage:
+            mes.append(message)
+        setattr(request, 'rails_messages', mes)
+        # storage.used = False

mchp/lib/templates/lib/base.html

@@ -274,8 +274,7 @@ <h5><small>20 friends and 3 classes in common</small></h5>
 	<!-- end user popover -->
 	<!-- Django Messages -->
 	<div class="django-messages">
-		{% if messages %}
-		{% for message in messages %}
+		{% for message in request.rails_messages %}
 		{% if message.tags %}
 		<div class="alert alert-{{message.tags}} alert-dismissible" role="alert">
 			<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
@@ -285,7 +284,6 @@ <h5><small>20 friends and 3 classes in common</small></h5>
 		</div>
 		{% endif %}
 		{% endfor %}
-		{% endif %}
 	</div>
 	{% block body %}
 	{% endblock %}