summaryrefslogtreecommitdiff
path: root/django/models
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/models
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/models')
-rw-r--r--django/models/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/models/__init__.py b/django/models/__init__.py
index 32350200a0..2937223361 100644
--- a/django/models/__init__.py
+++ b/django/models/__init__.py
@@ -62,9 +62,9 @@ for mod in modules:
for rel_opts, rel_field in klass._meta.get_all_related_many_to_many_objects():
rel_mod = rel_opts.get_model_module()
rel_obj_name = klass._meta.get_rel_object_method_name(rel_opts, rel_field)
- setattr(klass, 'get_%s' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_object', rel_mod, rel_field))
- setattr(klass, 'get_%s_count' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_count', rel_mod, rel_field))
- setattr(klass, 'get_%s_list' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_list', rel_mod, rel_field))
+ setattr(klass, 'get_%s' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_object', klass._meta, rel_mod, rel_field))
+ setattr(klass, 'get_%s_count' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_count', klass._meta, rel_mod, rel_field))
+ setattr(klass, 'get_%s_list' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_list', klass._meta, rel_mod, rel_field))
if rel_opts.app_label == klass._meta.app_label:
func = curry(meta.method_set_related_many_to_many, rel_opts, rel_field)
func.alters_data = True