diff options
Diffstat (limited to 'django/db/models/fields')
| -rw-r--r-- | django/db/models/fields/related.py | 7 | ||||
| -rw-r--r-- | django/db/models/fields/reverse_related.py | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index c7bfadb672..5357670d4f 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -290,8 +290,13 @@ class RelatedField(Field): if not cls._meta.abstract: if self.remote_field.related_name: - related_name = force_text(self.remote_field.related_name) % { + related_name = self.remote_field.related_name + else: + related_name = self.opts.default_related_name + if related_name: + related_name = force_text(related_name) % { 'class': cls.__name__.lower(), + 'model_name': cls._meta.model_name.lower(), 'app_label': cls._meta.app_label.lower() } self.remote_field.related_name = related_name diff --git a/django/db/models/fields/reverse_related.py b/django/db/models/fields/reverse_related.py index 304e688d5a..0d2ed35c69 100644 --- a/django/db/models/fields/reverse_related.py +++ b/django/db/models/fields/reverse_related.py @@ -187,11 +187,6 @@ class ForeignObjectRel(object): return None if self.related_name: return self.related_name - if opts.default_related_name: - return opts.default_related_name % { - 'model_name': opts.model_name.lower(), - 'app_label': opts.app_label.lower(), - } return opts.model_name + ('_set' if self.multiple else '') def get_cache_name(self): |