mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Fixed #24352 -- Fixed crash when coercing `ManyRelatedManager` to a string.

Browse Source
This commit is contained in:
Gabriel Muñumel 2015-02-26 08:50:53 +00:00 committed by Tim Graham
parent aa6853da22
commit 0831a43c3a
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/fields/related.py
View File

@ -855,6 +855,9 @@ def create_many_related_manager(superclass, rel):
) )
do_not_call_in_templates = True do_not_call_in_templates = True
def __str__(self):
return repr(self)
def _build_remove_filters(self, removed_vals): def _build_remove_filters(self, removed_vals):
filters = Q(**{self.source_field_name: self.related_val}) filters = Q(**{self.source_field_name: self.related_val})
# No need to add a subquery condition if removed_vals is a QuerySet without # No need to add a subquery condition if removed_vals is a QuerySet without

3
docs/releases/1.7.6.txt
View File

@ -9,4 +9,5 @@ Django 1.7.6 fixes several bugs in 1.7.5.
Bugfixes Bugfixes
======== ========
* ... * Fixed crash when coercing ``ManyRelatedManager`` to a string
(:ticket:`24352`).

4
tests/m2m_regress/tests.py
View File

@ -109,3 +109,7 @@ class M2MRegressionTests(TestCase):
worksheet.lines = hi worksheet.lines = hi
self.assertEqual(1, worksheet.lines.count()) self.assertEqual(1, worksheet.lines.count())
self.assertEqual(1, hi.count()) self.assertEqual(1, hi.count())
def test_many_related_manager_str(self):
worksheet = Worksheet.objects.create(id=1)
self.assertIn('ManyRelatedManager', str(worksheet.lines))