diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-12-28 12:48:07 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-12-29 09:01:35 +0100 |
| commit | 45519937e52c194776a26ec11a32f32958df7f10 (patch) | |
| tree | 13e535a25c81ebda6f767b009604c19030199389 /django/db | |
| parent | 72d04e03855536cf36090aedbb7aa8f1c4c8b443 (diff) | |
Added app labels to related fields checks messages E302-E305.
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/models/fields/related.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 5777ebc3b1..4c2247c08b 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -214,14 +214,16 @@ class RelatedField(FieldCacheMixin, Field): rel_is_hidden = self.remote_field.is_hidden() rel_name = self.remote_field.get_accessor_name() # i. e. "model_set" rel_query_name = self.related_query_name() # i. e. "model" - field_name = "%s.%s" % (opts.object_name, self.name) # i. e. "Model.field" + # i.e. "app_label.Model.field". + field_name = '%s.%s' % (opts.label, self.name) # Check clashes between accessor or reverse query name of `field` # and any other field name -- i.e. accessor for Model.foreign is # model_set and it clashes with Target.model_set. potential_clashes = rel_opts.fields + rel_opts.many_to_many for clash_field in potential_clashes: - clash_name = "%s.%s" % (rel_opts.object_name, clash_field.name) # i.e. "Target.model_set" + # i.e. "app_label.Target.model_set". + clash_name = '%s.%s' % (rel_opts.label, clash_field.name) if not rel_is_hidden and clash_field.name == rel_name: errors.append( checks.Error( @@ -249,9 +251,11 @@ class RelatedField(FieldCacheMixin, Field): # Model.m2m accessor. potential_clashes = (r for r in rel_opts.related_objects if r.field is not self) for clash_field in potential_clashes: - clash_name = "%s.%s" % ( # i. e. "Model.m2m" - clash_field.related_model._meta.object_name, - clash_field.field.name) + # i.e. "app_label.Model.m2m". + clash_name = '%s.%s' % ( + clash_field.related_model._meta.label, + clash_field.field.name, + ) if not rel_is_hidden and clash_field.get_accessor_name() == rel_name: errors.append( checks.Error( |