innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #10992: fixed a bug saving inlines with custom primary key fields. Thanks, Zain. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2009-05-14 02:23:53 +00:00
parent 690cb616ce
commit e508bfd27f
2 changed files with 69 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/forms/models.py
View File

@ -612,7 +612,12 @@ class BaseModelFormSet(BaseFormSet):
for form in self.initial_forms: for form in self.initial_forms:
pk_name = self._pk_field.name pk_name = self._pk_field.name
raw_pk_value = form._raw_value(pk_name) raw_pk_value = form._raw_value(pk_name)
pk_value = form.fields[pk_name].clean(raw_pk_value).pk
# clean() for different types of PK fields can sometimes return
# the model instance, and sometimes the PK. Handle either.
pk_value = form.fields[pk_name].clean(raw_pk_value)
pk_value = getattr(pk_value, 'pk', pk_value)
obj = existing_objects[pk_value] obj = existing_objects[pk_value]
if self.can_delete: if self.can_delete:
raw_delete_value = form._raw_value(DELETION_FIELD_NAME) raw_delete_value = form._raw_value(DELETION_FIELD_NAME)

126
tests/regressiontests/admin_views/tests.py
View File

@ -1326,69 +1326,69 @@ class AdminInlineTests(TestCase):
self.failUnlessEqual(Grommet.objects.count(), 1) self.failUnlessEqual(Grommet.objects.count(), 1)
self.failUnlessEqual(Grommet.objects.all()[0].name, "Grommet 1 Updated") self.failUnlessEqual(Grommet.objects.all()[0].name, "Grommet 1 Updated")
# def test_char_pk_inline(self): def test_char_pk_inline(self):
# "A model with a character PK can be saved as inlines. Regression for #10992" "A model with a character PK can be saved as inlines. Regression for #10992"
# # First add a new inline # First add a new inline
# self.post_data['doohickey_set-0-code'] = "DH1" self.post_data['doohickey_set-0-code'] = "DH1"
# self.post_data['doohickey_set-0-name'] = "Doohickey 1" self.post_data['doohickey_set-0-name'] = "Doohickey 1"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data) response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302) self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(DooHickey.objects.count(), 1) self.failUnlessEqual(DooHickey.objects.count(), 1)
# self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1") self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")
#
# # Check that the PK link exists on the rendered form # Check that the PK link exists on the rendered form
# response = self.client.get('/test_admin/admin/admin_views/collector/1/') response = self.client.get('/test_admin/admin/admin_views/collector/1/')
# self.assertContains(response, 'name="doohickey_set-0-code"') self.assertContains(response, 'name="doohickey_set-0-code"')
#
# # Now resave that inline # Now resave that inline
# self.post_data['doohickey_set-INITIAL_FORMS'] = "1" self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
# self.post_data['doohickey_set-0-code'] = "DH1" self.post_data['doohickey_set-0-code'] = "DH1"
# self.post_data['doohickey_set-0-name'] = "Doohickey 1" self.post_data['doohickey_set-0-name'] = "Doohickey 1"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data) response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302) self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(DooHickey.objects.count(), 1) self.failUnlessEqual(DooHickey.objects.count(), 1)
# self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1") self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")
#
# # Now modify that inline # Now modify that inline
# self.post_data['doohickey_set-INITIAL_FORMS'] = "1" self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
# self.post_data['doohickey_set-0-code'] = "DH1" self.post_data['doohickey_set-0-code'] = "DH1"
# self.post_data['doohickey_set-0-name'] = "Doohickey 1 Updated" self.post_data['doohickey_set-0-name'] = "Doohickey 1 Updated"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data) response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302) self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(DooHickey.objects.count(), 1) self.failUnlessEqual(DooHickey.objects.count(), 1)
# self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1 Updated") self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1 Updated")
# def test_integer_pk_inline(self): def test_integer_pk_inline(self):
# "A model with an integer PK can be saved as inlines. Regression for #10992" "A model with an integer PK can be saved as inlines. Regression for #10992"
# # First add a new inline # First add a new inline
# self.post_data['whatsit_set-0-index'] = "42" self.post_data['whatsit_set-0-index'] = "42"
# self.post_data['whatsit_set-0-name'] = "Whatsit 1" self.post_data['whatsit_set-0-name'] = "Whatsit 1"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data) response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302) self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(Whatsit.objects.count(), 1) self.failUnlessEqual(Whatsit.objects.count(), 1)
# self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1") self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1")
#
# # Check that the PK link exists on the rendered form # Check that the PK link exists on the rendered form
# response = self.client.get('/test_admin/admin/admin_views/collector/1/') response = self.client.get('/test_admin/admin/admin_views/collector/1/')
# self.assertContains(response, 'name="whatsit_set-0-index"') self.assertContains(response, 'name="whatsit_set-0-index"')
#
# # Now resave that inline # Now resave that inline
# self.post_data['whatsit_set-INITIAL_FORMS'] = "1" self.post_data['whatsit_set-INITIAL_FORMS'] = "1"
# self.post_data['whatsit_set-0-index'] = "42" self.post_data['whatsit_set-0-index'] = "42"
# self.post_data['whatsit_set-0-name'] = "Whatsit 1" self.post_data['whatsit_set-0-name'] = "Whatsit 1"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data) response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302) self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(Whatsit.objects.count(), 1) self.failUnlessEqual(Whatsit.objects.count(), 1)
# self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1") self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1")
#
# # Now modify that inline # Now modify that inline
# self.post_data['whatsit_set-INITIAL_FORMS'] = "1" self.post_data['whatsit_set-INITIAL_FORMS'] = "1"
# self.post_data['whatsit_set-0-index'] = "42" self.post_data['whatsit_set-0-index'] = "42"
# self.post_data['whatsit_set-0-name'] = "Whatsit 1 Updated" self.post_data['whatsit_set-0-name'] = "Whatsit 1 Updated"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data) response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302) self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(Whatsit.objects.count(), 1) self.failUnlessEqual(Whatsit.objects.count(), 1)
# self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1 Updated") self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1 Updated")
def test_inherited_inline(self): def test_inherited_inline(self):
"An inherited model can be saved as inlines. Regression for #11042" "An inherited model can be saved as inlines. Regression for #11042"