4.2 upgrade compatibility changes (#1911)

Author: daveoconnor

core/views.py

@@ -917,8 +917,8 @@ class QRCodeView(View):
 
     def get(self, request: HttpRequest, campaign_identifier: str, main_path: str = ""):
         absolute_url = request.build_absolute_uri(request.path)
-        referrer = request.META.get("HTTP_REFERER", "")
-        user_agent = request.META.get("HTTP_USER_AGENT", "")
+        referrer = request.headers.get("referer", "")
+        user_agent = request.headers.get("user-agent", "")
 
         plausible_payload = {
             "name": "pageview",
@@ -929,7 +929,7 @@ def get(self, request: HttpRequest, campaign_identifier: str, main_path: str = "
 
         headers = {"Content-Type": "application/json", "User-Agent": user_agent}
 
-        client_ip = request.META.get("HTTP_X_FORWARDED_FOR", "").split(",")[0].strip()
+        client_ip = request.headers.get("x-forwarded-for", "").split(",")[0].strip()
         client_ip = client_ip or request.META.get("REMOTE_ADDR")
 
         if client_ip:

users/admin.py

@@ -5,6 +5,7 @@
 from .models import User
 
 
+@admin.register(User)
 class EmailUserAdmin(UserAdmin):
     fieldsets = (
         (None, {"fields": ("email", "password")}),
@@ -59,6 +60,3 @@ class EmailUserAdmin(UserAdmin):
         "claimed",
     )
     search_fields = ("email", "display_name__unaccent")
-
-
-admin.site.register(User, EmailUserAdmin)