Ticket #8167: create_message.diff

django/views/generic/create_update.py

@@ -6 +6 @@
 from django.utils.translation import ugettext
 from django.contrib.auth.views import redirect_to_login
 from django.views.generic import GenericViewError
+from django.template import Template, Context
 
 
 def apply_extra_context(extra_context, context):
@@ -89 +90 @@
     except ObjectDoesNotExist:
         raise Http404("No %s found for %s"
                       % (model._meta.verbose_name, lookup_kwargs))
+                      
+def create_message(message_set, message, model, object):
+        """
+        Creates a message via the django template system.  If the message is set to none,
+        no message will be created. Also reassigns ``model._meta`` to `` model.meta`` to 
+        make it accessible by the template.
+        """
+        if message is not None:
+                model.meta = model._meta
+                template = Template(message)
+                context = Context({"model": model, "object": object})
+                message_set.create(message=template.render(context))
 
 def create_object(request, model=None, template_name=None,
         template_loader=loader, extra_context=None, post_save_redirect=None,
-        login_required=False, context_processors=None, form_class=None):
+        login_required=False, context_processors=None, form_class=None,
+        message="The {{ model.meta.verbose_name }} was created successfully."):
     """
     Generic object-creation function.
 
@@ -111 +125 @@
         if form.is_valid():
             new_object = form.save()
             if request.user.is_authenticated():
-                request.user.message_set.create(message=ugettext("The %(verbose_name)s was created successfully.") % {"verbose_name": model._meta.verbose_name})
+                create_message(request.user.message_set, message, model, new_object)
             return redirect(post_save_redirect, new_object)
     else:
         form = form_class()
@@ -130 +144 @@
         slug_field='slug', template_name=None, template_loader=loader,
         extra_context=None, post_save_redirect=None, login_required=False,
         context_processors=None, template_object_name='object',
-        form_class=None):
+        form_class=None, message="The {{ model.meta.verbose_name }} was updated successfully."):
     """
     Generic object-update function.
 
@@ -153 +167 @@
         if form.is_valid():
             obj = form.save()
             if request.user.is_authenticated():
-                request.user.message_set.create(message=ugettext("The %(verbose_name)s was updated successfully.") % {"verbose_name": model._meta.verbose_name})
+                create_message(request.user.message_set, message, model, obj)
             return redirect(post_save_redirect, obj)
     else:
         form = form_class(instance=obj)
@@ -173 +187 @@
 def delete_object(request, model, post_delete_redirect, object_id=None,
         slug=None, slug_field='slug', template_name=None,
         template_loader=loader, extra_context=None, login_required=False,
-        context_processors=None, template_object_name='object'):
+        context_processors=None, template_object_name='object',
+        message="The {{ model.meta.verbose_name }} was deleted."):
     """
     Generic object-delete function.
 
@@ -191 +206 @@
         return redirect_to_login(request.path)
 
     obj = lookup_object(model, object_id, slug, slug_field)
+    
+    from copy import deepcopy
+    old_object = deepcopy(obj)
 
     if request.method == 'POST':
         obj.delete()
         if request.user.is_authenticated():
-            request.user.message_set.create(message=ugettext("The %(verbose_name)s was deleted.") % {"verbose_name": model._meta.verbose_name})
+            create_message(request.user.message_set, message, model, old_object)
         return HttpResponseRedirect(post_delete_redirect)
     else:
         if not template_name: