From 635dcd9c2fa03aa5237649261f93e612f2099165 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Sat, 4 Feb 2006 00:59:02 +0000 Subject: [PATCH] magic-removal: Fixed get_model() so that it checks app_label (allowing admin to handle models with the same object_name but different app_labels) git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2265 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/loading.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/db/models/loading.py b/django/db/models/loading.py index 5dd59b1360..ba33024a31 100644 --- a/django/db/models/loading.py +++ b/django/db/models/loading.py @@ -47,5 +47,6 @@ def get_model(app_label, model_name): """ for app_mod in get_apps(): for model in get_models(app_mod): - if model._meta.object_name.lower() == model_name: + if model._meta.object_name.lower() == model_name and \ + model._meta.app_label == app_label: return model