Ticket #13652: add_message_flag_to_message_model.patch

django/django/contrib/admin/media/css/base.css

@@ -442 +442 @@
     margin: 0 0 3px 0;
     border-bottom: 1px solid #ddd;
     color: #666;
+}
+
+ul.messagelist li.info {
     background: #ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat;
 }
 
+ul.messagelist li.error {
+    background: #ffc url(../img/admin/icon_error.gif) 5px .3em no-repeat;
+}
+
 .errornote {
     font-size: 12px !important;
     display: block;

django/django/contrib/admin/options.py

@@ -535 +535 @@
         change_message = ' '.join(change_message)
         return change_message or _('No fields changed.')
 
-    def message_user(self, request, message):
+    def message_user(self, request, message, message_flag=None):
         """
         Send a message to the user. The default implementation
         posts a message using the auth Message object.
         """
-        request.user.message_set.create(message=message)
+        if message_flag is None:
+            request.user.message_set.create(message=message)
+        else:
+            request.user.message_set.create(message=message, message_flag=message_flag)
 
     def save_form(self, request, form, change):
         """

django/django/contrib/admin/templates/admin/base.html

@@ -55 +55 @@
     {% endif %}
 
         {% if messages %}
-        <ul class="messagelist">{% for message in messages %}<li>{{ message }}</li>{% endfor %}</ul>
+        <ul class="messagelist">{% for m in messages %}<li{% if m.is_info %} class="info"{% else %}{% if m.is_error %} class="error"{% endif %}{% endif %}>{{ m }}</li>{% endfor %}</ul>
         {% endif %}
 
     <!-- Content -->

django/django/contrib/auth/models.py

@@ -12 +12 @@
 
 UNUSABLE_PASSWORD = '!' # This will never be a valid hash
 
+INFO = 1
+ERROR = 2
+
 try:
     set
 except NameError:
@@ -261 +264 @@
     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
 
@@ -299 +302 @@
     """
     user = models.ForeignKey(User)
     message = models.TextField(_('message'))
+    message_flag = models.PositiveSmallIntegerField(default=INFO)
+
+    def is_info(self):
+        return self.message_flag == INFO
+
+    def is_error(self):
+        return self.message_flag == ERROR
 
     def __unicode__(self):
         return self.message