8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-29 08:02:24 +00:00

Merge branch 'add_switch_name_to_ports_search_results' into 'dev'

Added switch name to port search results, moved link to switch on switch name…

See merge request federez/re2o!312
This commit is contained in:
chirac 2018-09-26 15:34:32 +02:00
commit 311b13e694

View file

@ -32,6 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr> <tr>
{% trans "Port" as tr_port %} {% trans "Port" as tr_port %}
<th>{% include "buttons/sort.html" with prefix='port' col='port' text=tr_port %}</th> <th>{% include "buttons/sort.html" with prefix='port' col='port' text=tr_port %}</th>
{% if search %}
<th>{% trans "Switch" %}</th>
{% endif %}
{% trans "Room" as tr_room %} {% trans "Room" as tr_room %}
<th>{% include "buttons/sort.html" with prefix='port' col='room' text=tr_room %}</th> <th>{% include "buttons/sort.html" with prefix='port' col='room' text=tr_room %}</th>
{% trans "Interface" as tr_interface %} {% trans "Interface" as tr_interface %}
@ -46,10 +49,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</thead> </thead>
{% for port in port_list %} {% for port in port_list %}
<tr> <tr>
{% if search %}
<td><a href="{% url 'topologie:index-port' switchid=port.switch.id %}">{{ port.port }}</a></td>
{% else %}
<td>{{ port.port }}</td> <td>{{ port.port }}</td>
{% if search %}
<td>
<a href="{% url 'topologie:index-port' switchid=port.switch.id %}">{{ port.switch }}</a>
</td>
{% endif %} {% endif %}
<td> <td>
{% if port.room %} {% if port.room %}