Ticket #11607: 11607.diff

django/contrib/admin/widgets.py

@@ -147 +147 @@
 
     def label_for_value(self, value):
         key = self.rel.get_related_field().name
-        obj = self.rel.to._default_manager.get(**{key: value})
-        return '&nbsp;<strong>%s</strong>' % truncate_words(obj, 14)
+        try:
+            obj = self.rel.to._default_manager.get(**{key: value})
+            label = '&nbsp;<strong>%s</strong>' % truncate_words(obj, 14)
+        except self.rel.to.DoesNotExist:
+            label = ''
+        return label
 
 class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
     """

tests/regressiontests/admin_widgets/urls_rawid.py

@@ +1 @@
+
+from django.conf.urls.defaults import *
+import rawidadmin
+
+urlpatterns = patterns('',
+    (r'^rawid_admin/', include(rawidadmin.site.urls)),
+)

tests/regressiontests/admin_widgets/rawidadmin.py

@@ +1 @@
+"""
+
+"""
+from django.contrib import admin
+
+import models
+
+class RawIdAdmin(admin.AdminSite):
+    pass
+
+class CarAdmin(admin.ModelAdmin):
+    raw_id_fields = ['owner']
+
+site = RawIdAdmin(name='rawid-admin')
+
+site.register(models.User)
+site.register(models.Car, CarAdmin)

tests/regressiontests/admin_widgets/tests.py

@@ -130 +130 @@
 class OldAdminForeignKeyWidgetChangeList(AdminForeignKeyWidgetChangeList):
     urls = 'regressiontests.admin_widgets.urls2'
     admin_root = '/deep/down/admin'
+    
+class AdminForeignKeyRawIdWidgetInvalidId(DjangoTestCase):
+    urls = 'regressiontests.admin_widgets.urls_rawid'
+    fixtures = ["admin-widgets-users.xml"]
+    admin_root = '/rawid_admin'
+
+    def setUp(self):
+        self.client.login(username="super", password="secret")
+
+    def tearDown(self):
+        self.client.logout()
+
+    def test_invalid_id(self):
+        response = self.client.post('%s/admin_widgets/car/add/' % self.admin_root,
+                                    {'owner': '999', # does not exist
+                                     'make': 'VW',
+                                     'model': 'Karmann Ghia'})
+        self.assertEqual(response.status_code, 200)