From 533669507c3dcd103c317a551167db1af1079338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?=
Date: Fri, 6 Oct 2023 03:18:59 +0200
Subject: [PATCH] more improvements in message sending Ui
---
src/c3nav/control/templates/control/mesh_message_send.html | 2 +-
src/c3nav/control/templates/control/mesh_node_detail.html | 3 +++
src/c3nav/control/views/mesh.py | 5 +++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/c3nav/control/templates/control/mesh_message_send.html b/src/c3nav/control/templates/control/mesh_message_send.html
index 1a3ac22e..29a84a65 100644
--- a/src/c3nav/control/templates/control/mesh_message_send.html
+++ b/src/c3nav/control/templates/control/mesh_message_send.html
@@ -7,7 +7,7 @@
Send {{ msg_type }} message to {{ recipient }}
{% endblocktrans %}
{% else %}
- {% blocktrans trimmed with msg_type=form.msg_type %}
+ {% blocktrans trimmed with msg_type=form.msg_type.name %}
Send {{ msg_type }} message
{% endblocktrans %}
{% endif %}
diff --git a/src/c3nav/control/templates/control/mesh_node_detail.html b/src/c3nav/control/templates/control/mesh_node_detail.html
index 233991fc..f4ff538d 100644
--- a/src/c3nav/control/templates/control/mesh_node_detail.html
+++ b/src/c3nav/control/templates/control/mesh_node_detail.html
@@ -35,6 +35,9 @@
{% trans 'View messages' %}
+
+ {% trans 'Find route' %}
+
Firmware
diff --git a/src/c3nav/control/views/mesh.py b/src/c3nav/control/views/mesh.py
index 053295ba..aa15533e 100644
--- a/src/c3nav/control/views/mesh.py
+++ b/src/c3nav/control/views/mesh.py
@@ -120,12 +120,17 @@ class MeshMessageSendView(ControlPanelMixin, FormView):
if 'recipient' in self.kwargs and self.msg_type.name.startswith('CONFIG_'):
try:
node = MeshNode.objects.get(address=self.kwargs['recipient'])
+ return {}
except MeshNode.DoesNotExist:
pass
else:
return MeshMessage.get_type(self.msg_type).tojson(
node.last_messages[self.msg_type].parsed
)
+
+ if 'address' in self.request.GET and self.msg_type == MeshMessageType.MESH_ROUTE_REQUEST:
+ return {"address": self.request.GET["address"]}
+
return {}
def get_success_url(self):