Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
with:
persist-credentials: false
- name: Run zizmor
uses: zizmorcore/zizmor-action@e673c3917a1aef3c65c972347ed84ccd013ecda4 # v0.2.0
uses: zizmorcore/zizmor-action@e639db99335bc9038abc0e066dfcd72e23d26fb4 # v0.3.0
with:
advanced-security: false
annotations: true
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.9.0
rev: 25.12.0
hooks:
- id: black
exclude: \.py-tpl$
Expand All @@ -9,7 +9,7 @@ repos:
hooks:
- id: blacken-docs
additional_dependencies:
- black==25.9.0
- black==25.12.0
files: 'docs/.*\.txt$'
args: ["--rst-literal-block"]
- repo: https://github.com/PyCQA/isort
Expand All @@ -21,10 +21,10 @@ repos:
hooks:
- id: flake8
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v9.36.0
rev: v9.39.1
hooks:
- id: eslint
- repo: https://github.com/zizmorcore/zizmor-pre-commit
rev: v1.16.3
rev: v1.19.0
hooks:
- id: zizmor
8 changes: 7 additions & 1 deletion django/contrib/admin/checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,20 @@ def _check_autocomplete_fields_item(self, obj, field_name, label):
id="admin.E038",
)
try:
if isinstance(field.remote_field.model, str):
raise NotRegistered
related_admin = obj.admin_site.get_model_admin(field.remote_field.model)
except NotRegistered:
# field.remote_field.model could be a string or a class.
remote_model = getattr(
field.remote_field.model, "__name__", field.remote_field.model
)
return [
checks.Error(
'An admin for model "%s" has to be registered '
"to be referenced by %s.autocomplete_fields."
% (
field.remote_field.model.__name__,
remote_model,
type(obj).__name__,
),
obj=obj.__class__,
Expand Down
22 changes: 22 additions & 0 deletions tests/modeladmin/test_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -1724,6 +1724,28 @@ class Admin(ModelAdmin):
invalid_obj=Admin,
)

@isolate_apps("modeladmin")
def test_autocomplete_e039_unresolved_model(self):
class UnresolvedForeignKeyModel(models.Model):
unresolved = models.ForeignKey("missing.Model", models.CASCADE)

class Meta:
app_label = "modeladmin"

class Admin(ModelAdmin):
autocomplete_fields = ("unresolved",)

self.assertIsInvalid(
Admin,
UnresolvedForeignKeyModel,
msg=(
'An admin for model "missing.Model" has to be registered '
"to be referenced by Admin.autocomplete_fields."
),
id="admin.E039",
invalid_obj=Admin,
)

def test_autocomplete_e040(self):
class NoSearchFieldsAdmin(ModelAdmin):
pass
Expand Down