diff options
| author | Simon Charette <charette.s@gmail.com> | 2015-10-16 12:21:30 -0400 |
|---|---|---|
| committer | Simon Charette <charette.s@gmail.com> | 2015-10-16 14:22:15 -0400 |
| commit | c1b6a8a98b08fedfa3f3c69bc7add94c5841ba57 (patch) | |
| tree | de5a671a486863d6f24fc563727f9f04bb61ded1 /django | |
| parent | 4dcc2a195595f8d7ddad45bc4baf98ffdeec7f41 (diff) | |
Fixed #25560 -- Made empty string related_name invalid.
Thanks to Ali Lotfi for the initial report and patch
and Tim Graham for the review.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/fields/related.py | 2 | ||||
| -rw-r--r-- | django/db/models/fields/reverse_related.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index ef3de8f139..67bf3b88dc 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -122,7 +122,7 @@ class RelatedField(Field): import re import keyword related_name = self.remote_field.related_name - if not related_name: + if related_name is None: return [] is_valid_id = True if keyword.iskeyword(related_name): diff --git a/django/db/models/fields/reverse_related.py b/django/db/models/fields/reverse_related.py index 015fa02165..304e688d5a 100644 --- a/django/db/models/fields/reverse_related.py +++ b/django/db/models/fields/reverse_related.py @@ -154,7 +154,7 @@ class ForeignObjectRel(object): def is_hidden(self): "Should the related object be hidden?" - return self.related_name is not None and self.related_name[-1] == '+' + return bool(self.related_name) and self.related_name[-1] == '+' def get_joining_columns(self): return self.field.get_reverse_joining_columns() |
