From bc8875e37c2eb5e2fa3b86bcf620a6a97f955cfe Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 9 Feb 2012 18:57:40 +0000 Subject: Fixed #16958 -- Correctly use the queryset method in the auth app's UserAdmin class. Thanks, mpaolini. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17474 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_views/customadmin.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests/regressiontests/admin_views/customadmin.py') diff --git a/tests/regressiontests/admin_views/customadmin.py b/tests/regressiontests/admin_views/customadmin.py index 38ed38a8a4..d205e0e290 100644 --- a/tests/regressiontests/admin_views/customadmin.py +++ b/tests/regressiontests/admin_views/customadmin.py @@ -6,6 +6,8 @@ from __future__ import absolute_import from django.conf.urls import patterns from django.contrib import admin from django.http import HttpResponse +from django.contrib.auth.models import User +from django.contrib.auth.admin import UserAdmin from . import models, forms, admin as base_admin @@ -30,6 +32,14 @@ class Admin2(admin.AdminSite): def my_view(self, request): return HttpResponse("Django is a magical pony!") + +class UserLimitedAdmin(UserAdmin): + # used for testing password change on a user not in queryset + def queryset(self, request): + qs = super(UserLimitedAdmin, self).queryset(request) + return qs.filter(is_superuser=False) + + site = Admin2(name="admin2") site.register(models.Article, base_admin.ArticleAdmin) @@ -37,3 +47,4 @@ site.register(models.Section, inlines=[base_admin.ArticleInline]) site.register(models.Thing, base_admin.ThingAdmin) site.register(models.Fabric, base_admin.FabricAdmin) site.register(models.ChapterXtra1, base_admin.ChapterXtra1Admin) +site.register(User, UserLimitedAdmin) -- cgit v1.3