mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-09-12 01:03:09 +00:00
Répare de petits soucis de templates + problemes de rebase
This commit is contained in:
parent
6202ddd0fa
commit
a7ea8a1518
4 changed files with 4 additions and 11 deletions
|
@ -624,15 +624,6 @@ class ServiceRegenSerializer(NamespacedHMSerializer):
|
|||
}
|
||||
|
||||
|
||||
class ProfilSerializer(NamespacedHMSerializer):
|
||||
vlan_untagged = VlanSerializer(read_only=True)
|
||||
vlan_tagged = VlanPortSerializer(read_only=True, many=True)
|
||||
|
||||
class Meta:
|
||||
model = topologie.PortProfile
|
||||
fields = ('name', 'profil_default', 'vlan_untagged', 'vlan_tagged', 'radius_type', 'radius_mode', 'speed', 'mac_limit', 'flow_control', 'dhcp_snooping', 'dhcpv6_snooping', 'arp_protect', 'ra_guard', 'loop_protect', 'vlan_untagged', 'vlan_tagged')
|
||||
|
||||
|
||||
# LOCAL EMAILS
|
||||
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ import re2o.mixins
|
|||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('machines', '0083_remove_duplicate_rights'),
|
||||
('machines', '0085_sshfingerprint'),
|
||||
]
|
||||
|
||||
operations = [
|
|
@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% load acl %}
|
||||
{% load i18n %}
|
||||
{% load logs_extra %}
|
||||
|
||||
|
||||
<table class="table table-striped">
|
||||
|
@ -45,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% can_edit role %}
|
||||
{% include 'buttons/edit.html' with href='machines:edit-role' id=role.id %}
|
||||
{% acl_end %}
|
||||
{% include 'buttons/history.html' with href='machines:history' name='role' id=role.id %}
|
||||
{% history_button role %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
|
@ -71,6 +71,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% endif %}
|
||||
{% if sshfpform %}
|
||||
{% bootstrap_form_errors sshfpform %}
|
||||
{% endif %}
|
||||
{% if roleform %}
|
||||
{% bootstrap_form_errors roleform %}
|
||||
{% endif %}
|
||||
|
|
Loading…
Reference in a new issue