p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #23451 -- Fixed typo in inlineformset_factory() error message.

This commit is contained in:
Petras Zdanavičius 2014-09-08 22:54:57 +03:00 committed by Tim Graham
parent b161c01c48
commit f7eee04ebe
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/models.py
View File

@ -949,7 +949,7 @@ def _get_foreign_key(parent_model, model, fk_name=None, can_fail=False):
(fk.rel.to != parent_model and (fk.rel.to != parent_model and
fk.rel.to not in parent_model._meta.get_parent_list()): fk.rel.to not in parent_model._meta.get_parent_list()):
raise ValueError( raise ValueError(
"fk_name '%s' is not a ForeignKey to '%s.%'." "fk_name '%s' is not a ForeignKey to '%s.%s'."
% (fk_name, parent_model._meta.app_label, parent_model._meta.object_name)) % (fk_name, parent_model._meta.app_label, parent_model._meta.object_name))
elif len(fks_to_parent) == 0: elif len(fks_to_parent) == 0:
raise ValueError( raise ValueError(

3
docs/releases/1.7.1.txt
View File

@ -23,3 +23,6 @@ Bugfixes
* The ``@deconstructible`` decorator now fails with a ``ValueError`` if the * The ``@deconstructible`` decorator now fails with a ``ValueError`` if the
decorated object cannot automatically be imported (:ticket:`23418`). decorated object cannot automatically be imported (:ticket:`23418`).
* Fixed a typo in an ``inlineformset_factory()`` error message that caused a
crash (:ticket:`23451`).

6
tests/model_formsets/tests.py
View File

@ -815,6 +815,12 @@ class ModelFormsetTest(TestCase):
formset = AuthorBooksFormSet(data, instance=author, queryset=custom_qs) formset = AuthorBooksFormSet(data, instance=author, queryset=custom_qs)
self.assertTrue(formset.is_valid()) self.assertTrue(formset.is_valid())
def test_inline_formsets_with_wrong_fk_name(self):
""" Regression for #23451 """
message = "fk_name 'title' is not a ForeignKey to 'model_formsets.Author'."
with self.assertRaisesMessage(ValueError, message):
inlineformset_factory(Author, Book, fields="__all__", fk_name='title')
def test_custom_pk(self): def test_custom_pk(self):
# We need to ensure that it is displayed # We need to ensure that it is displayed