Skip to content

Commit

Permalink
[1.0.X] Fixed #10992: fixed a bug saving inlines with custom primary …
Browse files Browse the repository at this point in the history 
…key fields. Thanks, Zain. Backport of [10777] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
@jacobian
jacobian committed May 14, 2009
1 parent 5015860 commit c293450
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 63 deletions.
5 changes: 5 additions & 0 deletions django/forms/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,12 @@ def save_existing_objects(self, commit=True):
for form in self.initial_forms:
pk_name = self._pk_field.name
raw_pk_value = form._raw_value(pk_name)

# 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]
if self.can_delete:
raw_delete_value = form._raw_value(DELETION_FIELD_NAME)
Expand Down
126 changes: 63 additions & 63 deletions tests/regressiontests/admin_views/tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1164,69 +1164,69 @@ def test_explicit_autofield_inline(self):
self.failUnlessEqual(Grommet.objects.count(), 1)
self.failUnlessEqual(Grommet.objects.all()[0].name, "Grommet 1 Updated")

# def test_char_pk_inline(self):
# "A model with a character PK can be saved as inlines. Regression for #10992"
# # First add a new inline
# self.post_data['doohickey_set-0-code'] = "DH1"
# self.post_data['doohickey_set-0-name'] = "Doohickey 1"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(DooHickey.objects.count(), 1)
# self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")
#
# # Check that the PK link exists on the rendered form
# response = self.client.get('/test_admin/admin/admin_views/collector/1/')
# self.assertContains(response, 'name="doohickey_set-0-code"')
#
# # Now resave that inline
# self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
# self.post_data['doohickey_set-0-code'] = "DH1"
# self.post_data['doohickey_set-0-name'] = "Doohickey 1"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(DooHickey.objects.count(), 1)
# self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")
#
# # Now modify that inline
# self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
# self.post_data['doohickey_set-0-code'] = "DH1"
# self.post_data['doohickey_set-0-name'] = "Doohickey 1 Updated"
# response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
# self.failUnlessEqual(response.status_code, 302)
# self.failUnlessEqual(DooHickey.objects.count(), 1)
# self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1 Updated")

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

# Check that the PK link exists on the rendered form
response = self.client.get('/test_admin/admin/admin_views/collector/1/')
self.assertContains(response, 'name="doohickey_set-0-code"')

# Now resave that inline
self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
self.post_data['doohickey_set-0-code'] = "DH1"
self.post_data['doohickey_set-0-name'] = "Doohickey 1"
response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
self.failUnlessEqual(response.status_code, 302)
self.failUnlessEqual(DooHickey.objects.count(), 1)
self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")

# Now modify that inline
self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
self.post_data['doohickey_set-0-code'] = "DH1"
self.post_data['doohickey_set-0-name'] = "Doohickey 1 Updated"
response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
self.failUnlessEqual(response.status_code, 302)
self.failUnlessEqual(DooHickey.objects.count(), 1)
self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1 Updated")
def test_integer_pk_inline(self):
"A model with an integer PK can be saved as inlines. Regression for #10992"
# First add a new inline
self.post_data['whatsit_set-0-index'] = "42"
self.post_data['whatsit_set-0-name'] = "Whatsit 1"
response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
self.failUnlessEqual(response.status_code, 302)
self.failUnlessEqual(Whatsit.objects.count(), 1)
self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1")

# Check that the PK link exists on the rendered form
response = self.client.get('/test_admin/admin/admin_views/collector/1/')
self.assertContains(response, 'name="whatsit_set-0-index"')

# Now resave that inline
self.post_data['whatsit_set-INITIAL_FORMS'] = "1"
self.post_data['whatsit_set-0-index'] = "42"
self.post_data['whatsit_set-0-name'] = "Whatsit 1"
response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
self.failUnlessEqual(response.status_code, 302)
self.failUnlessEqual(Whatsit.objects.count(), 1)
self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1")

# Now modify that inline
self.post_data['whatsit_set-INITIAL_FORMS'] = "1"
self.post_data['whatsit_set-0-index'] = "42"
self.post_data['whatsit_set-0-name'] = "Whatsit 1 Updated"
response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
self.failUnlessEqual(response.status_code, 302)
self.failUnlessEqual(Whatsit.objects.count(), 1)
self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1 Updated")

def test_inherited_inline(self):
"An inherited model can be saved as inlines. Regression for #11042"
Expand Down

0 comments on commit c293450

Please sign in to comment.