mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-28 19:24:37 +00:00
Code Issues 32 Releases Wiki Activity

Refs #18823 -- Corrected field name in an m2m manager error message.

Browse Source
This commit is contained in:
Andrey Kuzminov 2016-12-21 13:13:12 +13:00 committed by Tim Graham
parent 39a8843802
commit b8741c0058
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/fields/related_descriptors.py
View File

@ -814,15 +814,17 @@ def create_forward_many_to_many_manager(superclass, rel, reverse):
self.target_field = self.through._meta.get_field(self.target_field_name) self.target_field = self.through._meta.get_field(self.target_field_name)
self.core_filters = {} self.core_filters = {}
self.pk_field_names = {}
for lh_field, rh_field in self.source_field.related_fields: for lh_field, rh_field in self.source_field.related_fields:
core_filter_key = '%s__%s' % (self.query_field_name, rh_field.name) core_filter_key = '%s__%s' % (self.query_field_name, rh_field.name)
self.core_filters[core_filter_key] = getattr(instance, rh_field.attname) self.core_filters[core_filter_key] = getattr(instance, rh_field.attname)
self.pk_field_names[lh_field.name] = rh_field.name
self.related_val = self.source_field.get_foreign_related_value(instance) self.related_val = self.source_field.get_foreign_related_value(instance)
if None in self.related_val: if None in self.related_val:
raise ValueError('"%r" needs to have a value for field "%s" before ' raise ValueError('"%r" needs to have a value for field "%s" before '
'this many-to-many relationship can be used.' % 'this many-to-many relationship can be used.' %
(instance, self.source_field_name)) (instance, self.pk_field_names[self.source_field_name]))
# Even if this relation is not to pk, we require still pk value. # Even if this relation is not to pk, we require still pk value.
# The wish is that the instance has been already saved to DB, # The wish is that the instance has been already saved to DB,
# although having a pk value isn't a guarantee of that. # although having a pk value isn't a guarantee of that.

4
tests/m2m_through_regress/tests.py
View File

@ -216,7 +216,7 @@ class ToFieldThroughTests(TestCase):
def test_m2m_relations_unsable_on_null_to_field(self): def test_m2m_relations_unsable_on_null_to_field(self):
nullcar = Car(make=None) nullcar = Car(make=None)
msg = ( msg = (
'"<Car: None>" needs to have a value for field "car" before this ' '"<Car: None>" needs to have a value for field "make" before this '
'many-to-many relationship can be used.' 'many-to-many relationship can be used.'
) )
with self.assertRaisesMessage(ValueError, msg): with self.assertRaisesMessage(ValueError, msg):
@ -258,7 +258,7 @@ class ToFieldThroughTests(TestCase):
def test_add_null_reverse_related(self): def test_add_null_reverse_related(self):
nulldriver = Driver.objects.create(name=None) nulldriver = Driver.objects.create(name=None)
msg = ( msg = (
'"<Driver: None>" needs to have a value for field "driver" before ' '"<Driver: None>" needs to have a value for field "name" before '
'this many-to-many relationship can be used.' 'this many-to-many relationship can be used.'
) )
with self.assertRaisesMessage(ValueError, msg): with self.assertRaisesMessage(ValueError, msg):