rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-23 20:03:11 +00:00
Code Issues Releases Wiki Activity

Finition, gestion du renvoie du profil par défaut du port

Browse source
This commit is contained in:
chirac 2018-06-30 16:19:02 +00:00 committed by Hugo LEVY-FALK
parent bac18a265d
commit ee79e21e35
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
search/views.py
View file

@ -262,9 +262,9 @@ def search_single_word(word, filters, user,
) | Q( ) | Q(
related__switch__interface__domain__name__icontains=word related__switch__interface__domain__name__icontains=word
) | Q( ) | Q(
radius__icontains=word custom_profil__name__icontains=word
) | Q( ) | Q(
vlan_force__name__icontains=word custom_profil__profil_default__icontains=word
) | Q( ) | Q(
details__icontains=word details__icontains=word
) )

30
topologie/models.py
View file

@ -413,19 +413,29 @@ class Port(AclMixin, RevMixin, models.Model):
@cached_property @cached_property
def get_port_profil(self): def get_port_profil(self):
"""Return the config profil for this port""" """Return the config profil for this port"""
if self.custom_profil: def profil_or_nothing(profil):
return custom_profil port_profil = PortProfile.objects.filter(profil_default=profil).first()
elif self.related: if port_profil:
return PortProfil.objects.get(profil_default='uplink') return port_profil
elif self.machine_interface:
if isinstance(self.machine_interface.machine, AccessPoint):
return PortProfil.objects.get(profil_default='access_point')
else: 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: elif self.room:
return PortProfil.objects.get(profil_default='room') return profil_or_nothing('room')
else: else:
return PortProfil.objects.get(profil_default='nothing') return profil_or_nothing('nothing')
@classmethod @classmethod
def get_instance(cls, portid, *_args, **kwargs): def get_instance(cls, portid, *_args, **kwargs):

2
topologie/templates/topologie/aff_port.html
View file

@ -70,7 +70,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% acl_end %} {% acl_end %}
{% endif %} {% endif %}
</td> </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>{{ port.details }}</td>
<td class="text-right"> <td class="text-right">
{% history_button port %} {% history_button port %}