summaryrefslogtreecommitdiff
path: root/django/contrib/admin/widgets.py
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2010-03-02 02:28:49 +0000
committerKaren Tracey <kmtracey@gmail.com>2010-03-02 02:28:49 +0000
commit2890c2295bbd9144e30a74e7be9d11b4903a5101 (patch)
tree7a908a2b93706de06acd9e55c97ab92381378d70 /django/contrib/admin/widgets.py
parent17c466a57bb6dc94a404af3fec24ef1c9f4a4e31 (diff)
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
Diffstat (limited to 'django/contrib/admin/widgets.py')
-rw-r--r--django/contrib/admin/widgets.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index 0954d3f3e2..d7befe4688 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -152,7 +152,10 @@ class ForeignKeyRawIdWidget(forms.TextInput):
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):