Changeset 4309

Timestamp:

01/12/07 13:40:06 (2 years ago)

Author:

jacob

Message:

Fixed #3287: method columns in the admin changelist can now have a boolean attribute that uses the clever little checkmark icons instead of the ugly "True" or "False" strings. Thanks for the patch, xian@mintchaos.com

Files:

• django/trunk/django/contrib/admin/templatetags/admin_list.py (modified) (3 diffs)
• django/trunk/docs/model-api.txt (modified) (1 diff)

django/trunk/django/contrib/admin/templatetags/admin_list.py

@@ -101 +101 @@
-                       "url": cl.get_query_string({ORDER_VAR: i, ORDER_TYPE_VAR: new_order_type}),
-                       "class_attrib": (th_classes and ' class="%s"' % ' '.join(th_classes) or '')}
+
+def _boolean_icon(field_val):
+    BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
+    return '<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (settings.ADMIN_MEDIA_PREFIX, BOOLEAN_MAPPING[field_val], field_val)
-
-def items_for_result(cl, result):
@@ -115 +119 @@
-                attr = getattr(result, field_name)
-                allow_tags = getattr(attr, 'allow_tags', False)
+                boolean = getattr(attr, 'boolean', False)
-                if callable(attr):
-                    attr = attr()
-
+
+
+
+
+
-            except (AttributeError, ObjectDoesNotExist):
-                result_repr = EMPTY_CHANGELIST_VALUE
@@ -148 +157 @@
-            # Booleans are special: We use images.
-            elif isinstance(f, models.BooleanField) or isinstance(f, models.NullBooleanField):
-
-
+
-            # FloatFields are special: Zero-pad the decimals.
-            elif isinstance(f, models.FloatField):

django/trunk/docs/model-api.txt

@@ -1268 +1268 @@
-                  return '<span style="color: #%s;">%s %s</span>' % (self.color_code, self.first_name, self.last_name)
-              colored_name.allow_tags = True
+
+    * If the string given is a method of the model that returns True or False 
+      Django will display a pretty "on" or "off" icon if you give the method a 
+      ``boolean`` attribute whose value is ``True``.
+
+      Here's a full example model::
+
+          class Person(models.Model):
+              first_name = models.CharField(maxlength=50)
+              birthday = models.DateField()
+
+              class Admin:
+                  list_display = ('name', 'born_in_fifties')
+
+              def born_in_fifties(self):
+                  return self.birthday.strftime('%Y')[:3] == 5
+              born_in_fifties.boolean = True
+
-
-    * The ``__str__()`` method is just as valid in ``list_display`` as any