Index: django/contrib/admin/widgets.py
===================================================================
--- django/contrib/admin/widgets.py (revision 9218)
+++ django/contrib/admin/widgets.py (working copy)
@@ -146,7 +146,7 @@
def label_for_value(self, value):
key = self.rel.get_related_field().name
- obj = self.rel.to.objects.get(**{key: value})
+ obj = self.rel.to._default_manager.get(**{key: value})
return ' %s' % truncate_words(obj, 14)
class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
Index: tests/regressiontests/admin_widgets/models.py
===================================================================
--- tests/regressiontests/admin_widgets/models.py (revision 9218)
+++ tests/regressiontests/admin_widgets/models.py (working copy)
@@ -24,14 +24,22 @@
def __unicode__(self):
return self.name
+class HiddenInventoryManager(models.Manager):
+ def get_query_set(self):
+ return super(HiddenInventoryManager, self).get_query_set().filter(hidden=False)
+
class Inventory(models.Model):
- barcode = models.PositiveIntegerField(unique=True)
- parent = models.ForeignKey('self', to_field='barcode', blank=True, null=True)
- name = models.CharField(blank=False, max_length=20)
+ hidden = models.BooleanField(default=False)
+ barcode = models.PositiveIntegerField(unique=True)
+ parent = models.ForeignKey('self', to_field='barcode', blank=True, null=True)
+ name = models.CharField(blank=False, max_length=20)
- def __unicode__(self):
- return self.name
+ default_manager = models.Manager()
+ objects = HiddenInventoryManager()
+ def __unicode__(self):
+ return self.name
+
__test__ = {'WIDGETS_TESTS': """
>>> from datetime import datetime
>>> from django.utils.html import escape, conditional_escape
@@ -97,10 +105,14 @@
>>> apple = Inventory.objects.create(barcode=86, name='Apple')
>>> pear = Inventory.objects.create(barcode=22, name='Pear')
>>> core = Inventory.objects.create(barcode=87, name='Core', parent=apple)
+>>> hidden = Inventory.objects.create(barcode=93, name='Hidden', hidden=True)
+>>> child_of_hidden = Inventory.objects.create(barcode=94, name='Child of hidden', parent=hidden)
>>> rel = Inventory._meta.get_field('parent').rel
>>> w = ForeignKeyRawIdWidget(rel)
>>> print w.render('test', core.parent_id, attrs={})
Apple
+>>> print w.render('test', child_of_hidden.parent_id, attrs={})
+ Hidden
""" % {
'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX,
'STORAGE_URL': default_storage.url(''),