Changeset 687

Timestamp:

09/25/05 15:36:05 (3 years ago)

Author:

adrian

Message:

Fixed #468 -- Model classes now get an accessor method to get the human-readable value for each field that has 'choices' set. Thanks, Robert

Files:

• django/trunk/django/core/meta/__init__.py (modified) (2 diffs)

django/trunk/django/core/meta/__init__.py

@@ -593 +593 @@
-
-        for f in opts.fields:
+            if f.choices:
+                # Add "get_thingie_display" method to get human-readable value.
+                func = curry(method_get_display_value, f)
+                setattr(new_class, 'get_%s_display' % f.name, func)
-            if isinstance(f, DateField) or isinstance(f, DateTimeField):
-                # Add "get_next_by_thingie" and "get_previous_by_thingie" methods
@@ -990 +994 @@
-    kwargs['limit'] = 1
-    return get_object_func(**kwargs)
+
+# CHOICE-RELATED METHODS ###################
+
+def method_get_display_value(field, self):
+    value = getattr(self, field.column)
+    return dict(field.choices).get(value, value)
-
-# FILE-RELATED METHODS #####################