mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-29 22:56:46 +01:00
Code Issues Releases Wiki Activity

Fixed #21967: Added check for object in ModelFormMixin.get_form_kwargs.

Browse Source 
Thanks lagovas.lagovas at gmail.com for the report.
This commit is contained in:
Ryan Kaskel 2014-02-09 10:53:23 +00:00 committed by Tim Graham
parent 80cd64ee17
commit 75a96f06e9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/views/generic/edit.py
View File

@ -122,7 +122,8 @@ class ModelFormMixin(FormMixin, SingleObjectMixin):
Returns the keyword arguments for instantiating the form.
"""
kwargs = super(ModelFormMixin, self).get_form_kwargs()
kwargs.update({'instance': self.object})
if hasattr(self, 'object'):
kwargs.update({'instance': self.object})
return kwargs
def get_success_url(self):

8
tests/generic_views/test_edit.py
View File

@ -9,7 +9,7 @@ from django import forms
from django.test import TestCase
from django.test.client import RequestFactory
from django.views.generic.base import View
from django.views.generic.edit import FormMixin, CreateView
from django.views.generic.edit import FormMixin, ModelFormMixin, CreateView
from . import views
from .models import Artist, Author
@ -55,6 +55,12 @@ class ModelFormMixinTests(TestCase):
form_class = views.AuthorGetQuerySetFormView().get_form_class()
self.assertEqual(form_class._meta.model, Author)
def test_get_form_checks_for_object(self):
mixin = ModelFormMixin()
mixin.request = RequestFactory().get('/')
self.assertEqual({'initial': {}, 'prefix': None},
mixin.get_form_kwargs())
class CreateViewTests(TestCase):
urls = 'generic_views.urls'