Просмотр исходного кода

Update new alerts count before sending response.

Ralfp 12 лет назад
Родитель
Сommit
3f0456ef33
2 измененных файлов с 10 добавлено и 9 удалено
  1. 8 7
      misago/alerts/views.py
  2. 2 2
      templates/sora/alerts.html

+ 8 - 7
misago/alerts/views.py

@@ -38,13 +38,14 @@ def show_alerts(request):
                 alerts['older'].append(alert)
             except KeyError:
                 alerts['older'] = [alert]
-    response = request.theme.render_to_response('alerts.html',
-                                                {
-                                                 'alerts': alerts
-                                                 },
-                                                context_instance=RequestContext(request));
-    # Sync alerts
+    
+    new_alerts = request.user.alerts
     request.user.alerts = 0
     request.user.alerts_date = now
     request.user.save(force_update=True)
-    return response
+    return request.theme.render_to_response('alerts.html',
+                                            {
+                                             'new_alerts': new_alerts,
+                                             'alerts': alerts,
+                                             },
+                                            context_instance=RequestContext(request));

+ 2 - 2
templates/sora/alerts.html

@@ -28,8 +28,8 @@
 {% endblock %}
 
 {% macro get_title() -%}
-{% if user.alerts -%}
-{% trans count=user.alerts -%}
+{% if new_alerts -%}
+{% trans count=new_alerts -%}
 You have one new alert
 {%- pluralize -%}
 You have {{ count }} new alerts