diff options
| author | Adam Bogdał <adam@bogdal.pl> | 2017-06-14 08:36:07 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-06-14 08:57:43 -0400 |
| commit | 9f4e0fde0a25ae0c21359f5194435aaf5ca341c7 (patch) | |
| tree | 2d357cb03834ceb0f12eea6f985b7d9a569a0d3d | |
| parent | bd0c9388c0508811b979a76e439e7fdabc0621df (diff) | |
Moved common code to RelatedField.deconstruct().
| -rw-r--r-- | django/db/models/fields/related.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index b01142f056..e92eca8fb4 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -322,6 +322,10 @@ class RelatedField(Field): name, path, args, kwargs = super().deconstruct() if self.remote_field.limit_choices_to: kwargs['limit_choices_to'] = self.remote_field.limit_choices_to + if self.remote_field.related_name is not None: + kwargs['related_name'] = self.remote_field.related_name + if self.remote_field.related_query_name is not None: + kwargs['related_query_name'] = self.remote_field.related_query_name return name, path, args, kwargs def get_forward_related_filter(self, obj): @@ -561,10 +565,6 @@ class ForeignObject(RelatedField): kwargs['from_fields'] = self.from_fields kwargs['to_fields'] = self.to_fields - if self.remote_field.related_name is not None: - kwargs['related_name'] = self.remote_field.related_name - if self.remote_field.related_query_name is not None: - kwargs['related_query_name'] = self.remote_field.related_query_name if self.remote_field.parent_link: kwargs['parent_link'] = self.remote_field.parent_link # Work out string form of "to" @@ -1395,10 +1395,6 @@ class ManyToManyField(RelatedField): kwargs['db_table'] = self.db_table if self.remote_field.db_constraint is not True: kwargs['db_constraint'] = self.remote_field.db_constraint - if self.remote_field.related_name is not None: - kwargs['related_name'] = self.remote_field.related_name - if self.remote_field.related_query_name is not None: - kwargs['related_query_name'] = self.remote_field.related_query_name # Rel needs more work. if isinstance(self.remote_field.model, str): kwargs['to'] = self.remote_field.model |