Changeset 9445

Timestamp:

11/14/08 20:21:32 (2 months ago)

Author:

brosner

Message:

[1.0.X] Fixed #9258 -- Use _default_manager in ForeignKeyRawIdWidget?.label_for_value. Thanks nullie for the patch.

Backport of r9444 from trunk.

Files:

• django/branches/releases/1.0.X/django/contrib/admin/widgets.py (modified) (1 diff)
• django/branches/releases/1.0.X/tests/regressiontests/admin_widgets/models.py (modified) (2 diffs)

django/branches/releases/1.0.X/django/contrib/admin/widgets.py

@@ -147 +147 @@
-    def label_for_value(self, value):
-        key = self.rel.get_related_field().name
-objects
+_default_manager
-        return '&nbsp;<strong>%s</strong>' % truncate_words(obj, 14)
-

django/branches/releases/1.0.X/tests/regressiontests/admin_widgets/models.py

@@ -25 +25 @@
-        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)
+   
+   # see #9258
+   default_manager = models.Manager()
+   objects = HiddenInventoryManager()
-
-   def __unicode__(self):
@@ -102 +111 @@
->>> print w.render('test', core.parent_id, attrs={})
-<input type="text" name="test" value="86" class="vForeignKeyRawIdAdminField" /><a href="../../../admin_widgets/inventory/?t=barcode" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_MEDIA_PREFIX)simg/admin/selector-search.gif" width="16" height="16" alt="Lookup" /></a>&nbsp;<strong>Apple</strong>
+
+# see #9258
+>>> hidden = Inventory.objects.create(barcode=93, name='Hidden', hidden=True) 
+>>> child_of_hidden = Inventory.objects.create(barcode=94, name='Child of hidden', parent=hidden)
+>>> print w.render('test', child_of_hidden.parent_id, attrs={}) 
+<input type="text" name="test" value="93" class="vForeignKeyRawIdAdminField" /><a href="../../../admin_widgets/inventory/?t=barcode" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_MEDIA_PREFIX)simg/admin/selector-search.gif" width="16" height="16" alt="Lookup" /></a>&nbsp;<strong>Hidden</strong>
-""" % {
-    'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX,