summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorAndriy Sokolovskiy <me@asokolovskiy.com>2015-05-09 13:57:13 +0300
committerTim Graham <timograham@gmail.com>2015-10-13 04:17:50 -0700
commiteb85e6672aeb00c67a3666785965edeceed976af (patch)
treeebcf5ce3b942a69ce535b152a6fdcab9e521da99 /django/db
parent15359f1fe9b032311fbb0e9bb2d1bb7c86ea855c (diff)
[1.8.x] Fixed #24156 -- Fixed inherited related name of ManyToManyField.
Fixed situation when parent abstract model declares related_name='+' and child models had an invalid queryset. Backport of f7b297815819153b53dc1125d3f42869fb1b7ebc from master
Diffstat (limited to 'django/db')
-rw-r--r--django/db/models/fields/related.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index cdb01cadcb..47b479c763 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -2540,7 +2540,7 @@ class ManyToManyField(RelatedField):
# related_name with one generated from the m2m field name. Django
# still uses backwards relations internally and we need to avoid
# clashes between multiple m2m fields with related_name == '+'.
- self.rel.related_name = "_%s_+" % name
+ self.rel.related_name = "_%s_%s_+" % (cls.__name__.lower(), name)
super(ManyToManyField, self).contribute_to_class(cls, name, **kwargs)