2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

remove duplicate node/number

Browse source
This commit is contained in:
Laura Klünder 2024-03-30 22:14:02 +01:00
parent 1fcb68f426
commit a9eaa56070
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/mesh/models.py
View file

@ -268,7 +268,7 @@ class MeshNode(models.Model):
def name(self): def name(self):
node_message = self.last_messages[MeshMessageType.CONFIG_NODE] node_message = self.last_messages[MeshMessageType.CONFIG_NODE]
if node_message: if node_message:
return f"{node_message.parsed.content.number} {node_message.parsed.content.name}".strip() return f"{node_message.parsed.content.number} – {node_message.parsed.content.name}".strip()
def __str__(self): def __str__(self):
if self.name: if self.name:

1
src/c3nav/mesh/templates/mesh/nodes.html
View file

@ -18,7 +18,6 @@
<tr> <tr>
<td> <td>
<a href="{% url "mesh.node.detail" pk=node.address %}">{{ node }}</a> <a href="{% url "mesh.node.detail" pk=node.address %}">{{ node }}</a>
<br>{{ node.last_messages.CONFIG_NODE.parsed.content.number }} – {{ node.last_messages.CONFIG_NODE.parsed.content.name }}
{% if node.ranging_beacon %} {% if node.ranging_beacon %}
<br> <br>
<a href="{% url "editor.ranging_beacons.edit" space=node.ranging_beacon.space_id pk=node.ranging_beacon.pk %}">Ranging Beacon #{{ node.ranging_beacon.pk }}</a> <a href="{% url "editor.ranging_beacons.edit" space=node.ranging_beacon.space_id pk=node.ranging_beacon.pk %}">Ranging Beacon #{{ node.ranging_beacon.pk }}</a>