p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removing the old url resolution method in contrib.auth.admin.UserAdmin which was deprecated in Django 1.1 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Chris Beaven 2011-08-17 04:06:42 +00:00
parent 283526a5a6
commit 0e3d8bcb26
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/contrib/auth/admin.py
View File

@ -55,15 +55,6 @@ class UserAdmin(admin.ModelAdmin):
ordering = ('username',) ordering = ('username',)
filter_horizontal = ('user_permissions',) filter_horizontal = ('user_permissions',)
def __call__(self, request, url):
# this should not be here, but must be due to the way __call__ routes
# in ModelAdmin.
if url is None:
return self.changelist_view(request)
if url.endswith('password'):
return self.user_change_password(request, url.split('/')[0])
return super(UserAdmin, self).__call__(request, url)
def get_fieldsets(self, request, obj=None): def get_fieldsets(self, request, obj=None):
if not obj: if not obj:
return self.add_fieldsets return self.add_fieldsets