diff options
| author | Tim Graham <timograham@gmail.com> | 2013-07-18 10:07:55 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-07-18 10:07:55 -0700 |
| commit | 9a2715da8b4c196e1cccd3241f6f585da53359a6 (patch) | |
| tree | e19e9a1ffe8668118be5b73f8654e6f9389bb614 | |
| parent | dce8945ea63c636a71f3bc5d610dccebc08c52eb (diff) | |
| parent | 3a0022918989edfcb8d73f484b1b900935300abe (diff) | |
Merge pull request #1372 from loic/admin
Cleaned up UserAdmin.get_form() that worked around a bug fixed in 23e1b59.
| -rw-r--r-- | django/contrib/auth/admin.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py index 5a1db68613..ca660606e5 100644 --- a/django/contrib/auth/admin.py +++ b/django/contrib/auth/admin.py @@ -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) |