p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #22982 -- Added GenericRelatedObjectManager.__str__. to prevent crash. 

Thanks bendavis78 for the report.

Forwardport of 29585e9b6a from stable/1.7.x
This commit is contained in:
Jacob Haslehurst 2014-08-07 16:06:44 +10:00 committed by Tim Graham
parent f9f9f3ad60
commit f676305ece
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/contenttypes/fields.py
View File

@ -457,6 +457,9 @@ def create_generic_related_manager(superclass):
) )
do_not_call_in_templates = True do_not_call_in_templates = True
def __str__(self):
return repr(self)
def get_queryset(self): def get_queryset(self):
try: try:
return self.instance._prefetched_objects_cache[self.prefetch_cache_name] return self.instance._prefetched_objects_cache[self.prefetch_cache_name]

4
tests/generic_relations_regress/tests.py
View File

@ -260,3 +260,7 @@ class GenericRelationTests(TestCase):
# where the pre_delete signal should fire and prevent deletion. # where the pre_delete signal should fire and prevent deletion.
with self.assertRaises(ProtectedError): with self.assertRaises(ProtectedError):
related.delete() related.delete()
def test_ticket_22982(self):
place = Place.objects.create(name='My Place')
self.assertIn('GenericRelatedObjectManager', str(place.links))