From 1e1df10bfa156a7f6b0baecdbda3d127dd8b448c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sat, 30 Mar 2024 17:20:24 +0100 Subject: [PATCH] fix route request UI --- src/c3nav/mesh/templates/mesh/mesh_message_sending.html | 7 ++++--- src/c3nav/mesh/views/messages.py | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/c3nav/mesh/templates/mesh/mesh_message_sending.html b/src/c3nav/mesh/templates/mesh/mesh_message_sending.html index 174ad84a..faf8d8bd 100644 --- a/src/c3nav/mesh/templates/mesh/mesh_message_sending.html +++ b/src/c3nav/mesh/templates/mesh/mesh_message_sending.html @@ -9,8 +9,9 @@ {% block subcontent %}

Go back

- {% if msg_type == "MESH_ROUTE_REQUEST" %} -

Route to {{ msg_data.address }} {% if node_name %} ({{ node_name }}){% endif %}

+ {{ msg_type_raw }} + {% if msg_type_raw == "MESH_ROUTE_REQUEST" %} +

Route to {{ msg_data.content.address }} {% if node_name %} ({{ node_name }}){% endif %}

{% endif %}
@@ -32,7 +33,7 @@ {% endfor %}
- {% if msg_type == "MESH_ROUTE_REQUEST" %} + {% if msg_type_raw == "MESH_ROUTE_REQUEST" %}

Routes

diff --git a/src/c3nav/mesh/views/messages.py b/src/c3nav/mesh/views/messages.py index 14868b36..9c14e241 100644 --- a/src/c3nav/mesh/views/messages.py +++ b/src/c3nav/mesh/views/messages.py @@ -130,4 +130,5 @@ class MeshMessageSendingView(MeshControlMixin, TemplateView): "node_name": node_names.get(data["msg_data"]["content"].get("address"), ""), "recipients": [(address, node_names[address]) for address in data["recipients"]], "msg_type": MeshMessageType[data["msg_data"]["content"]["msg_type"]].pretty_name, + "msg_type_raw": MeshMessageType[data["msg_data"]["content"]["msg_type"]], }