Mark new alerts correctly

misago/apps/alerts.py

@@ -17,14 +17,15 @@ def alerts(request):
         else:
             alerts_qs = ()
 
+        response_html = render_to_string('alerts/modal.html',
+                                         {'alerts': alerts_qs},
+                                         context_instance=RequestContext(request))
+
         if request.user.alerts:
             request.user.alerts = 0
             request.user.alerts_date = timezone.now()
             request.user.save(force_update=True)
 
-        response_html = render_to_string('alerts/modal.html',
-                                         {'alerts': alerts_qs},
-                                         context_instance=RequestContext(request))
         return json_response(request,
                              json={'html': response_html})
 

templates/cranefly/alerts/modal.html

@@ -9,8 +9,8 @@
     <tbody>
       {% for alert in alerts %}
       <tr>
-        <td class="alert-icon{% if alert.date > user.alerts_date %} alert-new{% endif %}">
-          {% if alert.date > user.alerts_date %}
+        <td class="alert-icon{% if not user.alerts_date or alert.date > user.alerts_date %} alert-new{% endif %}">
+          {% if not user.alerts_date or alert.date > user.alerts_date %}
           <i class="icon-star tooltip-top" title="{% trans %}New notification{% endtrans %}"></i>
           {% else %}
           <i class="icon-star-empty tooltip-top" title="{% trans %}Old notification{% endtrans %}"></i>