Merge branch 'update-pre-commit' into increase-django-version

Author: mikemanger

.pre-commit-config.yaml

@@ -8,6 +8,12 @@ repos:
           entry: 'breakpoint\(\)|set_trace'
           language: pygrep
 
+    -   repo: https://github.com/adamchainz/django-upgrade
+        rev: "1.20.0"
+        hooks:
+        -   id: django-upgrade
+            args: [--target-version, "2.2"]
+
     - repo: https://github.com/pre-commit/pre-commit-hooks
       rev: 'v4.6.0'
       hooks:

password_policies/admin.py

@@ -14,6 +14,7 @@ def force_password_change(modeladmin, request, queryset):
     )
 
 
+@admin.register(PasswordHistory)
 class PasswordHistoryAdmin(admin.ModelAdmin):
     date_hierarchy = "created"
     exclude = ("password",)
@@ -29,6 +30,7 @@ def has_add_permission(self, request):
         return False
 
 
+@admin.register(PasswordChangeRequired)
 class PasswordChangeRequiredAdmin(admin.ModelAdmin):
     date_hierarchy = "created"
     list_display = ("id", "user", "created")
@@ -47,7 +49,3 @@ def get_readonly_fields(self, request, obj=None):
             return ["user"]
         else:
             return []
-
-
-admin.site.register(PasswordHistory, PasswordHistoryAdmin)
-admin.site.register(PasswordChangeRequired, PasswordChangeRequiredAdmin)

password_policies/views.py

@@ -261,7 +261,7 @@ def form_valid(self, form):
             "request": self.request,
         }
         if self.is_admin_site:
-            opts = dict(opts, domain_override=self.request.META["HTTP_HOST"])
+            opts = dict(opts, domain_override=self.request.headers["host"])
         form.save(**opts)
         return super().form_valid(form)