diff options
| author | Petras Zdanavičius <petraszd@gmail.com> | 2014-09-08 22:54:57 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-09-08 17:22:23 -0400 |
| commit | f7eee04ebe32277d2f3d7860abfb9a22c6ccf19d (patch) | |
| tree | 4708f0eb67509029caf939370745811fbf606cc8 | |
| parent | b161c01c48b4c353d7d1a47e9097391a8eb2e047 (diff) | |
Fixed #23451 -- Fixed typo in inlineformset_factory() error message.
| -rw-r--r-- | django/forms/models.py | 2 | ||||
| -rw-r--r-- | docs/releases/1.7.1.txt | 3 | ||||
| -rw-r--r-- | tests/model_formsets/tests.py | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/django/forms/models.py b/django/forms/models.py index 0760f9d540..b23d815775 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -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 not in parent_model._meta.get_parent_list()): 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)) elif len(fks_to_parent) == 0: raise ValueError( diff --git a/docs/releases/1.7.1.txt b/docs/releases/1.7.1.txt index 85421f2fa4..368749f595 100644 --- a/docs/releases/1.7.1.txt +++ b/docs/releases/1.7.1.txt @@ -23,3 +23,6 @@ Bugfixes * The ``@deconstructible`` decorator now fails with a ``ValueError`` if the decorated object cannot automatically be imported (:ticket:`23418`). + +* Fixed a typo in an ``inlineformset_factory()`` error message that caused a + crash (:ticket:`23451`). diff --git a/tests/model_formsets/tests.py b/tests/model_formsets/tests.py index 19c0a6d9d5..58d8bcc9ab 100644 --- a/tests/model_formsets/tests.py +++ b/tests/model_formsets/tests.py @@ -815,6 +815,12 @@ class ModelFormsetTest(TestCase): formset = AuthorBooksFormSet(data, instance=author, queryset=custom_qs) 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): # We need to ensure that it is displayed |