DBC22-6784: added alias to route_at, safe filter in email template

Author: ray-oxd

src/backend/apps/event/admin.py

@@ -1,6 +1,6 @@
 from apps.cms.models import DriveBCMapWidget
 from apps.event.models import Event, QueuedEventNotification
-from apps.event.tasks import queue_event_notifications
+from apps.event.tasks import queue_event_notifications, send_queued_notifications
 from django.contrib.gis import admin
 
 
@@ -18,9 +18,15 @@ class EventAdmin(admin.GISModelAdmin):
     gis_widget = DriveBCMapWidget
 
 
+@admin.action(description="Send all queued notifications")
+def send_all_queued_notifications(modeladmin, request, queryset):
+    send_queued_notifications()
+
+
 class QueuedEventNotificationAdmin(admin.ModelAdmin):
     readonly_fields = ('id', 'created_at', 'modified_at')
     list_display = ('id', 'event_id', 'route_id', 'created_at')
+    actions = [send_all_queued_notifications]
 
 
 admin.site.register(QueuedEventNotification, QueuedEventNotificationAdmin)

src/backend/apps/event/templates/email/event_updated.html

@@ -78,7 +78,7 @@
 																		{{ event.display_category_title }}
 																	</td>
 																</tr>
-																
+
 																<tr>
 																	{% if event.severity == 'MAJOR' %}
 																	<td style="font-size: 1.25rem; font-weight:700; color:#D8292F; padding: 8px 12px 0">
@@ -92,7 +92,7 @@
                                   {% endif %}
 																	</td>
 																</tr>
-                                
+
 																{% if event.direction != 'NONE' %}
 																<tr>
 																	<td style="font-size: 0.875rem; font-weight:700; color:#464341; padding: 8px 12px 0">
@@ -118,7 +118,7 @@
 																					Location
 																				</td>
 																				<td style="font-size: 0.875rem; vertical-align:top; padding: 12px 0 0 8px">
-																					{{ event.location_description }}
+																					{{ event.location_description|safe }}
 																				</td>
 																			</tr>
 																			<tr>

src/backend/apps/feed/serializers.py

@@ -228,7 +228,9 @@ def to_internal_value(self, data):
                     continue
 
                 # route_at - was "route-designator" but now "name"
-                data['route_at'] = start_or_end.get('name', '')
+                route_name = start_or_end.get('name', '')
+                route_alias = start_or_end.get('alias')
+                data['route_at'] = route_name + ', ' + route_alias if route_alias else route_name
 
                 # closest_landmark / location_description
                 nearby_locs = start_or_end.get('nearby', [])