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

Merge pull request #1372 from loic/admin 

Cleaned up UserAdmin.get_form() that worked around a bug fixed in 23e1b59.
This commit is contained in:
Tim Graham 2013-07-18 10:07:55 -07:00
parent dce8945ea6 3a00229189
commit 9a2715da8b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,10 +70,7 @@ class UserAdmin(admin.ModelAdmin):
""" """
defaults = {} defaults = {}
if obj is None: if obj is None:
defaults.update({ defaults['form'] = self.add_form
'form': self.add_form,
'fields': admin.util.flatten_fieldsets(self.add_fieldsets),
})
defaults.update(kwargs) defaults.update(kwargs)
return super(UserAdmin, self).get_form(request, obj, **defaults) return super(UserAdmin, self).get_form(request, obj, **defaults)