mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-12-23 07:23:46 +00:00
Finition, gestion du renvoie du profil par défaut du port
This commit is contained in:
parent
447919a2af
commit
e6b8c5c899
3 changed files with 23 additions and 13 deletions
|
@ -262,9 +262,9 @@ def search_single_word(word, filters, user,
|
|||
) | Q(
|
||||
related__switch__interface__domain__name__icontains=word
|
||||
) | Q(
|
||||
radius__icontains=word
|
||||
custom_profil__name__icontains=word
|
||||
) | Q(
|
||||
vlan_force__name__icontains=word
|
||||
custom_profil__profil_default__icontains=word
|
||||
) | Q(
|
||||
details__icontains=word
|
||||
)
|
||||
|
|
|
@ -409,19 +409,29 @@ class Port(AclMixin, RevMixin, models.Model):
|
|||
@cached_property
|
||||
def get_port_profil(self):
|
||||
"""Return the config profil for this port"""
|
||||
if self.custom_profil:
|
||||
return custom_profil
|
||||
elif self.related:
|
||||
return PortProfil.objects.get(profil_default='uplink')
|
||||
elif self.machine_interface:
|
||||
if isinstance(self.machine_interface.machine, AccessPoint):
|
||||
return PortProfil.objects.get(profil_default='access_point')
|
||||
def profil_or_nothing(profil):
|
||||
port_profil = PortProfile.objects.filter(profil_default=profil).first()
|
||||
if port_profil:
|
||||
return port_profil
|
||||
else:
|
||||
return PortProfil.objects.get(profil_default='asso_machine')
|
||||
nothing = PortProfile.objects.filter(profil_default='nothing').first()
|
||||
if not nothing:
|
||||
nothing = PortProfile.objects.create(profil_default='nothing', name='nothing', radius_type='NO')
|
||||
return nothing
|
||||
|
||||
if self.custom_profil:
|
||||
return self.custom_profil
|
||||
elif self.related:
|
||||
return profil_or_nothing('uplink')
|
||||
elif self.machine_interface:
|
||||
if hasattr(self.machine_interface.machine, 'accesspoint'):
|
||||
return profil_or_nothing('access_point')
|
||||
else:
|
||||
return profil_or_nothing('asso_machine')
|
||||
elif self.room:
|
||||
return PortProfil.objects.get(profil_default='room')
|
||||
return profil_or_nothing('room')
|
||||
else:
|
||||
return PortProfil.objects.get(profil_default='nothing')
|
||||
return profil_or_nothing('nothing')
|
||||
|
||||
@classmethod
|
||||
def get_instance(cls, portid, *_args, **kwargs):
|
||||
|
|
|
@ -65,7 +65,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% acl_end %}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{% if not port.custom_profil %}Par défaut{% else %}{{port.custom_profil}}{% endif %}</td>
|
||||
<td>{% if not port.custom_profil %}<u>Par défaut</u> : {% endif %}{{port.get_port_profil}}</td>
|
||||
<td>{{ port.details }}</td>
|
||||
<td class="text-right">
|
||||
<a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'port' port.pk %}">
|
||||
|
|
Loading…
Reference in a new issue