Changeset 654

Timestamp:

09/19/05 22:46:11 (3 years ago)

Author:

adrian

Message:

Fixed #525 -- admin.list_filter now works with ManyToManyFields? whose primary keys are integers and are not called 'id'. Thanks for the bug report, nesh

Files:

• django/trunk/django/views/admin/main.py (modified) (3 diffs)

django/trunk/django/views/admin/main.py

@@ -200 +200 @@
-                else:
-                    lookup_title = f.verbose_name
-id__exact' % f.name
+%s__exact' % (f.name, f.rel.to.pk.name)
-                lookup_val = request.GET.get(lookup_kwarg, None)
-                lookup_choices = f.rel.to.get_model_module().get_list()
@@ -209 +209 @@
-                        get_query_string(params, {}, [lookup_kwarg])))
-                    for val in lookup_choices:
+                        pk_val = getattr(val, f.rel.to.pk.column)
-                        filter_template.append('<li%s><a href="%s">%r</a></li>\n' % \
-val.id
-val.id
+pk_val
+pk_val
-                    filter_template.append('</ul>\n\n')
-            # Field with choices.
@@ -917 +918 @@
-            new_data.update(_get_flattened_data(f, getattr(obj, f.column)))
-        for f in opts.many_to_many:
+            get_list_func = getattr(obj, 'get_%s_list' % f.rel.singular)
-            if f.rel.raw_id_admin:
-i.id) for i in getattr(obj, 'get_%s_list' % f.rel.singular)
+getattr(i, f.rel.to.pk.column)) for i in get_list_func
-            elif not f.rel.edit_inline:
-i.id for i in getattr(obj, 'get_%s_list' % f.rel.singular)
+getattr(i, f.rel.to.pk.column) for i in get_list_func
-        for rel_obj, rel_field in inline_related_objects:
-            var_name = rel_obj.object_name.lower()