summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-09-13 03:48:06 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-09-13 03:48:06 +0000
commitadaf046591c087adb3ca31cd8ea901ed525918df (patch)
tree15d65ae64145a3ae9cdea6a6b72cadf5f1397c16 /django/core
parent84560c7f8457643ccd6e9121994ee54780e28cef (diff)
Fixed metasystem bug when using get_related_many_to_many() method with a custom-named primary key. Thanks, stane
git-svn-id: http://code.djangoproject.com/svn/django/trunk@639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core')
-rw-r--r--django/core/meta/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/meta/__init__.py b/django/core/meta/__init__.py
index bc225f584f..22bd4817d6 100644
--- a/django/core/meta/__init__.py
+++ b/django/core/meta/__init__.py
@@ -947,8 +947,8 @@ def method_add_related(rel_obj, rel_mod, rel_field, self, *args, **kwargs):
# Handles related many-to-many object retrieval.
# Examples: Album.get_song(), Album.get_song_list(), Album.get_song_count()
-def method_get_related_many_to_many(method_name, rel_mod, rel_field, self, **kwargs):
- kwargs['%s__id__exact' % rel_field.name] = self.id
+def method_get_related_many_to_many(method_name, opts, rel_mod, rel_field, self, **kwargs):
+ kwargs['%s__%s__exact' % (rel_field.name, opts.pk.name)] = getattr(self, opts.pk.column)
return getattr(rel_mod, method_name)(**kwargs)
# Handles setting many-to-many related objects.