Merge branch 'master' into stable

* master:
  Pridan T.G. jako prijemce admin mailu
  Middleware for AJAX requests

mamweb/middleware.py

@@ -40,7 +40,11 @@ class LoggedInHintCookieMiddleware(object):
     def process_response(self, request, response):
         if request.is_secure():
             # assuming full session info (as the conn. is secure)
-            if request.user.is_authenticated():
+            try:
+                user = request.user
+            except AttributeError: # no user - ajax or other special request
+                return response
+            if user.is_authenticated():
                 if not self.cookie_correct(request):
                     expiry = None if request.session.get_expire_at_browser_close() else request.session.get_expiry_date()
                     response.set_cookie(self.cookie_name, value=self.cookie_value, expires=expiry, secure=False)

mamweb/settings_prod.py

@@ -48,6 +48,7 @@ import os
 SERVER_EMAIL = 'mamweb-prod-errors@mam.mff.cuni.cz'
 ADMINS = [
         ('Petr Pecha', 'nejlepsitextovyeditorjevim@gmail.com'),
+        ('Tomas Gavenciak', 'gavento@gmail.com'),
         ('Matěj Kocián', 'matej.kocian@gmail.com'),
         ]
 

mamweb/settings_test.py

@@ -50,6 +50,7 @@ import os
 SERVER_EMAIL = 'mamweb-test-errors@mam.mff.cuni.cz'
 ADMINS = [
     ('Petr Pecha', 'nejlepsitextovyeditorjevim@gmail.com'),
+    ('Tomas Gavenciak', 'gavento@gmail.com'),
 ]