Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #11465: Ensure nonexistent pks enterd in an admin raw id field …

…do not

cause a server error. Thanks for report and initial patch sacre@wp.pl.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@12648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2890c2295bbd9144e30a74e7be9d11b4903a5101 1 parent 17c466a
@kmtracey kmtracey authored
View
5 django/contrib/admin/widgets.py
@@ -152,7 +152,10 @@ def url_parameters(self):
def label_for_value(self, value):
key = self.rel.get_related_field().name
- obj = self.rel.to._default_manager.using(self.db).get(**{key: value})
+ try:
+ obj = self.rel.to._default_manager.using(self.db).get(**{key: value})
+ except self.rel.to.DoesNotExist:
+ return ''
return '&nbsp;<strong>%s</strong>' % escape(truncate_words(obj, 14))
class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
View
24 tests/regressiontests/admin_widgets/tests.py
@@ -127,3 +127,27 @@ def tearDown(self):
def test_changelist_foreignkey(self):
response = self.client.get('%s/admin_widgets/car/' % self.admin_root)
self.failUnless('%s/auth/user/add/' % self.admin_root in response.content)
+
+class AdminForeignKeyRawIdWidget(DjangoTestCase):
+ fixtures = ["admin-widgets-users.xml"]
+ admin_root = '/widget_admin'
+
+ def setUp(self):
+ self.client.login(username="super", password="secret")
+
+ def tearDown(self):
+ self.client.logout()
+
+ def test_nonexistent_target_id(self):
+ band = models.Band.objects.create(name='Bogey Blues')
+ pk = band.pk
+ band.delete()
+ post_data = {
+ "band": u'%s' % pk,
+ }
+ # Try posting with a non-existent pk in a raw id field: this
+ # should result in an error message, not a server exception.
+ response = self.client.post('%s/admin_widgets/event/add/' % self.admin_root,
+ post_data)
+ self.assertContains(response,
+ 'Select a valid choice. That choice is not one of the available choices.')
View
4 tests/regressiontests/admin_widgets/widgetadmin.py
@@ -19,8 +19,12 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
return db_field.formfield(**kwargs)
return super(CarTireAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
+class EventAdmin(admin.ModelAdmin):
+ raw_id_fields = ['band']
+
site = WidgetAdmin(name='widget-admin')
site.register(models.User)
site.register(models.Car, CarAdmin)
site.register(models.CarTire, CarTireAdmin)
+site.register(models.Event, EventAdmin)
Please sign in to comment.
Something went wrong with that request. Please try again.