mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-22 11:23:10 +00:00
Fix #112: Switch representation is only displayed on switch details
- The nice switch representation is only displayes on the swithc details page and not on any other page using the `topologie/aff_port.html` (like the search) - Use acl to display links or not on the switch detail page
This commit is contained in:
Maël Kervella
parent
52a35e523d
commit
c8b2f95cb9
3 changed files with 141 additions and 77 deletions
|
|
@ -24,69 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% load acl %}
|
||||
|
||||
|
||||
<div class="table-responsive" style="font-size: 12px">
|
||||
<table class="table table-bordered text-center text-nowrap">
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
{% for port in port_list|slice:"::2" %}
|
||||
<td class="bg-primary text-white">{{ port.port }}</td>
|
||||
{% endfor %}
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
{% for port in port_list|slice:"::2" %}
|
||||
{% if port.room %}
|
||||
<td class="p-3 mb-2 bg-success text-dark">
|
||||
{{ port.room }}
|
||||
{% elif port.machine_interface %}
|
||||
<td class="p-3 mb-2 bg-warning text-dark">
|
||||
<a href="{% url 'users:profil' userid=port.machine_interface.machine.user.id %}">{{ port.machine_interface }}</a>
|
||||
{% elif port.related%}
|
||||
<td class="p-3 mb-2 bg-danger text-dark">
|
||||
<a href="{% url 'topologie:index-port' switchid=port.related.switch.id %}">{{ port.related }}</a>
|
||||
{% else %}
|
||||
<td class="p-3 mb-2 bg-info text-dark">
|
||||
Vide
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
|
||||
{% for port in port_list|slice:"1::2" %}
|
||||
<td class="bg-primary text-white">{{ port.port }}</td>
|
||||
{% endfor %}
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
{% for port in port_list|slice:"1::2" %}
|
||||
{% if port.room %}
|
||||
<td class="p-3 mb-2 bg-success text-dark">
|
||||
{{ port.room }}
|
||||
{% elif port.machine_interface %}
|
||||
<td class="p-3 mb-2 bg-warning text-dark">
|
||||
<a href="{% url 'users:profil' userid=port.machine_interface.machine.user.id %}">{{ port.machine_interface }}</a>
|
||||
{% elif port.related%}
|
||||
<td class="p-3 mb-2 bg-danger text-dark">
|
||||
<a href="{% url 'topologie:index-port' switchid=port.related.switch.id %}">{{ port.related }}</a>
|
||||
{% else %}
|
||||
<td class="p-3 mb-2 bg-info text-dark">
|
||||
Vide
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
|
|
@ -105,18 +42,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<tr>
|
||||
<td>{{ port.port }}</td>
|
||||
<td>
|
||||
{% if port.room %}
|
||||
{{ port.room }}
|
||||
{% endif %}
|
||||
{% if port.room %}{{ port.room }}{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if port.machine_interface %}
|
||||
<a href="{% url 'users:profil' userid=port.machine_interface.machine.user.id %}">{{ port.machine_interface }}</a>
|
||||
{% can_view port.machine_interface.machine.user %}
|
||||
<a href="{% url 'users:profil' userid=port.machine_interface.machine.user.id %}">
|
||||
{{ port.machine_interface }}
|
||||
</a>
|
||||
{% acl_else %}
|
||||
{{ port.machine_interface }}
|
||||
{% acl_end %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if port.related %}
|
||||
<a href="{% url 'topologie:index-port' switchid=port.related.switch.id %}">{{ port.related }}</a>
|
||||
{% can_view port.related.switch %}
|
||||
<a href="{% url 'topologie:index-port' switchid=port.related.switch.id %}">
|
||||
{{ port.related }}
|
||||
</a>
|
||||
{% acl_else %}
|
||||
{{ port.related }}
|
||||
{% acl_end %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{{ port.radius }}</td>
|
||||
|
|
|
|||
116
topologie/templates/topologie/aff_repr_switch.html
Normal file
116
topologie/templates/topologie/aff_repr_switch.html
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
{% comment %}
|
||||
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||
se veut agnostique au réseau considéré, de manière à être installable en
|
||||
quelques clics.
|
||||
|
||||
Copyright © 2017 Gabriel Détraz
|
||||
Copyright © 2017 Goulven Kermarec
|
||||
Copyright © 2017 Augustin Lemesle
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
{% endcomment %}
|
||||
|
||||
{% load acl %}
|
||||
|
||||
<div class="table-responsive" style="font-size: 12px">
|
||||
<table class="table table-bordered text-center text-nowrap">
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
{% for port in port_list|slice:"::2" %}
|
||||
<td class="bg-primary text-white">{{ port.port }}</td>
|
||||
{% endfor %}
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
{% for port in port_list|slice:"::2" %}
|
||||
{% if port.room %}
|
||||
<td class="p-3 mb-2 bg-success text-dark">
|
||||
{{ port.room }}
|
||||
</td>
|
||||
{% elif port.machine_interface %}
|
||||
<td class="p-3 mb-2 bg-warning text-dark">
|
||||
{% can_view port.machine_interface.machine.user %}
|
||||
<a href="{% url 'users:profil' userid=port.machine_interface.machine.user.id %}">
|
||||
{{ port.machine_interface }}
|
||||
</a>
|
||||
{% acl_else %}
|
||||
{{ port.machine_interface }}
|
||||
{% acl_end %}
|
||||
</td>
|
||||
{% elif port.related%}
|
||||
<td class="p-3 mb-2 bg-danger text-dark">
|
||||
{% can_view port.related.switch %}
|
||||
<a href="{% url 'topologie:index-port' switchid=port.related.switch.id %}">
|
||||
{{ port.related }}
|
||||
</a>
|
||||
{% acl_else %}
|
||||
{{ port.related }}
|
||||
{% acl_end %}
|
||||
</td>
|
||||
{% else %}
|
||||
<td class="p-3 mb-2 bg-info text-dark">
|
||||
Vide
|
||||
</td>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
|
||||
{% for port in port_list|slice:"1::2" %}
|
||||
<td class="bg-primary text-white">{{ port.port }}</td>
|
||||
{% endfor %}
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
{% for port in port_list|slice:"1::2" %}
|
||||
{% if port.room %}
|
||||
<td class="p-3 mb-2 bg-success text-dark">
|
||||
{{ port.room }}
|
||||
</td>
|
||||
{% elif port.machine_interface %}
|
||||
<td class="p-3 mb-2 bg-warning text-dark">
|
||||
{% can_view port.machine_interface.machine.user %}
|
||||
<a href="{% url 'users:profil' userid=port.machine_interface.machine.user.id %}">
|
||||
{{ port.machine_interface }}
|
||||
</a>
|
||||
{% acl_else %}
|
||||
{{ port.machine_interface }}
|
||||
{% acl_end %}
|
||||
</td>
|
||||
{% elif port.related%}
|
||||
<td class="p-3 mb-2 bg-danger text-dark">
|
||||
{% can_view port.related.switch %}
|
||||
<a href="{% url 'topologie:index-port' switchid=port.related.switch.id %}">
|
||||
{{ port.related }}
|
||||
</a>
|
||||
{% acl_else %}
|
||||
{{ port.related }}
|
||||
{% acl_end %}
|
||||
</td>
|
||||
{% else %}
|
||||
<td class="p-3 mb-2 bg-info text-dark">
|
||||
Vide
|
||||
</td>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
|
@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:create-ports' id_switch %}"><i class="fa fa-plus"></i> Ajouter des ports</a>
|
||||
{% acl_end %}
|
||||
<hr>
|
||||
{% include "topologie/aff_repr_switch.html" with port_list=port_list %}
|
||||
{% include "topologie/aff_port.html" with port_list=port_list %}
|
||||
<br />
|
||||
<br />
|
||||
|
|
|
|||
Loading…
Reference in a new issue