Ticket #14014: 14014.diff

django/contrib/auth/admin.py

@@ -1 @@
-from django import template
 from django.db import transaction
 from django.conf import settings
 from django.contrib import admin
@@ -13 +12 @@
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext, ugettext_lazy as _
 from django.views.decorators.csrf import csrf_protect
+from django.utils.encoding import force_unicode
 
 csrf_protect_m = method_decorator(csrf_protect)
 
@@ -103 +103 @@
         extra_context.update(defaults)
         return super(UserAdmin, self).add_view(request, form_url, extra_context)
 
+    def response_add(self, request, obj, post_url_continue='../%s/'):
+        """
+        Determines the HttpResponse for the add_view stage. It mostly
+        defers to its superclass implementation but is slightly
+        customized because the User model has a different workflow.
+        """
+        opts = obj._meta
+        pk_value = obj._get_pk_val()
+
+        msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj)}
+        # Here, we distinguish between different save types by checking for
+        # the presence of keys in request.POST.
+        if request.POST.has_key("_addanother"):
+            self.message_user(request, msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name)))
+            return HttpResponseRedirect(request.path)
+        else:
+            return super(UserAdmin, self).response_add(request, obj, post_url_continue)
+
     def user_change_password(self, request, id):
         if not self.has_change_permission(request):
             raise PermissionDenied