diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2010-03-02 02:39:26 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2010-03-02 02:39:26 +0000 |
| commit | 08a698ed462b0e20a3a15b196152fee53e48ced9 (patch) | |
| tree | 87f3157062b490bac10d669f5fa00db9e2da39c2 /django | |
| parent | 5f70a728767236a18b8effaa120e2218b7307c9b (diff) | |
[1.1.X] 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.
Backport of r12648 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/widgets.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py index f0ecb384d4..a9023aa273 100644 --- a/django/contrib/admin/widgets.py +++ b/django/contrib/admin/widgets.py @@ -148,7 +148,10 @@ class ForeignKeyRawIdWidget(forms.TextInput): def label_for_value(self, value): key = self.rel.get_related_field().name - obj = self.rel.to._default_manager.get(**{key: value}) + try: + obj = self.rel.to._default_manager.get(**{key: value}) + except self.rel.to.DoesNotExist: + return '' return ' <strong>%s</strong>' % escape(truncate_words(obj, 14)) class ManyToManyRawIdWidget(ForeignKeyRawIdWidget): |