Ticket #10759: admin_user_templates.diff

django/contrib/auth/admin.py

@@ -76 +76 @@
                     return HttpResponseRedirect('../%s/' % new_user.id)
         else:
             form = self.add_form()
-        return render_to_response('admin/auth/user/add_form.html', {
+        
+        template_choices = [
+            'admin/%s/%s/add_form.html' % (self.opts.app_label, self.opts.object_name.lower()),
+            'admin/auth/user/add_form.html',
+        ]
+        
+        return render_to_response(template_choices, {
             'title': _('Add user'),
             'form': form,
             'is_popup': '_popup' in request.REQUEST,
@@ -108 +114 @@
                 return HttpResponseRedirect('..')
         else:
             form = self.change_password_form(user)
-        return render_to_response('admin/auth/user/change_password.html', {
+        
+        template_choices = [
+            'admin/%s/%s/change_password.html' % (self.opts.app_label, self.opts.object_name.lower()),
+            'admin/auth/user/change_password.html',
+        ]
+        
+        return render_to_response(template_choices, {
             'title': _('Change password: %s') % escape(user.username),
             'form': form,
             'is_popup': '_popup' in request.REQUEST,