p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Luke Plant 2006-02-04 00:59:02 +00:00
parent 9881e049d0
commit 635dcd9c2f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/loading.py
View File

@ -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