Commit 9a2715da authored by Tim Graham's avatar Tim Graham
Browse files

Merge pull request #1372 from loic/admin 

Cleaned up UserAdmin.get_form() that worked around a bug fixed in 23e1b59c.
parents dce8945e 3a002291

django/contrib/auth/admin.py

+1 −4
Original line number Diff line number Diff line
@@ -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)