Ticket #3995: message_type.2.diff

usr/lib/python2.3/site-packages/django_trunk/django/contrib/auth/models.py

@@ -225 +225 @@
     def get_and_delete_messages(self):
         messages = []
         for m in self.message_set.all():
-            messages.append(m.message)
+            messages.append(m)
             m.delete()
         return messages
 
@@ -252 +252 @@
         return self._profile_cache
 
 class Message(models.Model):
-    """The message system is a lightweight way to queue messages for given users. A message is associated with a User instance (so it is only applicable for registered users). There's no concept of expiration or timestamps. Messages are created by the Django admin after successful actions. For example, "The poll Foo was created successfully." is a message.
+    """The message system is a lightweight way to queue messages for given users. A message is associated with a User instance (so it is only applicable for registered users). There's no concept of expiration or timestamps. Messages are created by the Django admin after successful actions. For example, "The poll Foo was created successfully." is a message. Now a message can be categorized as 'success' or 'failure' or 'generic' with success being the default.
     """
     user = models.ForeignKey(User)
     message = models.TextField(_('message'))
+    category = models.CharField(maxlength=1, choices=(('S', 'success'), ('F', 'failure'), ('G', 'generic'),), default='S')
 
     def __str__(self):
         return self.message