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
commit 9a2715da8b
1 changed files with 1 additions and 4 deletions

View File

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