diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-01 15:07:13 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-01 15:07:13 +0000 |
| commit | 906f55bf0975e6aa4eb63f4ca71e54baff200bf8 (patch) | |
| tree | 6716e2645d13885ce66ad8dac6e9f49a56ecd399 /django | |
| parent | 53d5f27e75dd3f2b98f9277b09a1944132637130 (diff) | |
[1.0.X] Fixed #7510: the ModelAdmin now uses `self.queryset` instead of the default manager. Thanks, Alex Gaynor. Backport of r10314 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 88c26b80bd..8e57b51f19 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -556,7 +556,7 @@ class ModelAdmin(BaseModelAdmin): opts = model._meta try: - obj = model._default_manager.get(pk=object_id) + obj = self.queryset(request).get(pk=object_id) except model.DoesNotExist: # Don't raise Http404 just yet, because we haven't checked # permissions yet. We don't want an unauthenticated user to be able @@ -680,7 +680,7 @@ class ModelAdmin(BaseModelAdmin): app_label = opts.app_label try: - obj = self.model._default_manager.get(pk=object_id) + obj = self.queryset(request).get(pk=object_id) except self.model.DoesNotExist: # Don't raise Http404 just yet, because we haven't checked # permissions yet. We don't want an unauthenticated user to be able |