Author: jacob
Date: 2009-05-13 21:30:25 -0500 (Wed, 13 May 2009)
New Revision: 10779
Modified:
django/branches/releases/1.0.X/django/forms/models.py
django/branches/releases/1.0.X/tests/regressiontests/admin_views/tests.py
Log:
[1.0.X] Fixed #10992: fixed a bug saving inlines with custom primary key
fields. Thanks, Zain. Backport of [10777] from trunk.
Modified: django/branches/releases/1.0.X/django/forms/models.py
===================================================================
--- django/branches/releases/1.0.X/django/forms/models.py 2009-05-14
02:28:56 UTC (rev 10778)
+++ django/branches/releases/1.0.X/django/forms/models.py 2009-05-14
02:30:25 UTC (rev 10779)
@@ -605,7 +605,12 @@
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)
Modified:
django/branches/releases/1.0.X/tests/regressiontests/admin_views/tests.py
===================================================================
--- django/branches/releases/1.0.X/tests/regressiontests/admin_views/tests.py
2009-05-14 02:28:56 UTC (rev 10778)
+++ django/branches/releases/1.0.X/tests/regressiontests/admin_views/tests.py
2009-05-14 02:30:25 UTC (rev 10779)
@@ -1164,70 +1164,70 @@
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_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_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"
# First add a new inline
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
