Ticket #10759: admin_user_template_vars.diff

django/contrib/auth/admin.py

@@ -32 +32 @@
     ordering = ('username',)
     filter_horizontal = ('user_permissions',)
 
+    # Custom templates (designed to be over-ridden in subclasses)
+    add_form_template = None
+    change_password_template = None
+
     def __call__(self, request, url):
         # this should not be here, but must be due to the way __call__ routes
         # in ModelAdmin.
@@ -76 +80 @@
                     return HttpResponseRedirect('../%s/' % new_user.id)
         else:
             form = self.add_form()
-        return render_to_response('admin/auth/user/add_form.html', {
+
+        context = {
             'title': _('Add user'),
             'form': form,
             'is_popup': '_popup' in request.REQUEST,
@@ -93 +98 @@
             'username_help_text': self.model._meta.get_field('username').help_text,
             'root_path': self.admin_site.root_path,
             'app_label': self.model._meta.app_label,            
-        }, context_instance=template.RequestContext(request))
+        }
 
+        return render_to_response(self.add_form_template or [
+            'admin/%s/%s/add_form.html' % (self.opts.app_label, self.opts.object_name.lower()),
+            'admin/auth/user/add_form.html',
+        ], context, context_instance=template.RequestContext(request))
+
     def user_change_password(self, request, id):
         if not request.user.has_perm('auth.change_user'):
             raise PermissionDenied
@@ -108 +118 @@
                 return HttpResponseRedirect('..')
         else:
             form = self.change_password_form(user)
-        return render_to_response('admin/auth/user/change_password.html', {
-            'title': _('Change password: %s') % escape(user.username),
-            'form': form,
-            'is_popup': '_popup' in request.REQUEST,
-            'add': True,
-            'change': False,
-            'has_delete_permission': False,
-            'has_change_permission': True,
-            'has_absolute_url': False,
-            'opts': self.model._meta,
-            'original': user,
-            'save_as': False,
-            'show_save': True,
-            'root_path': self.admin_site.root_path,
-        }, context_instance=RequestContext(request))
+        
+        context = {
+                'title': _('Change password: %s') % escape(user.username),
+                'form': form,
+                'is_popup': '_popup' in request.REQUEST,
+                'add': True,
+                'change': False,
+                'has_delete_permission': False,
+                'has_change_permission': True,
+                'has_absolute_url': False,
+                'opts': self.model._meta,
+                'original': user,
+                'save_as': False,
+                'show_save': True,
+                'root_path': self.admin_site.root_path,
+        }
 
+        return render_to_response(self.change_password_template or [
+            'admin/%s/%s/change_password.html' % (self.opts.app_label, self.opts.object_name.lower()),
+            'admin/auth/user/change_password.html',
+        ], context, context_instance=RequestContext(request))
 
+
 admin.site.register(Group, GroupAdmin)
 admin.site.register(User, UserAdmin)