mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 17:36:27 +00:00
Merge branch 'hotfix_typo_get_port_profile' into 'dev'
Hotfix typo get port profile See merge request federez/re2o!324
This commit is contained in:
commit
152b0a6421
3 changed files with 6 additions and 6 deletions
|
@ -483,12 +483,12 @@ class SwitchPortSerializer(NamespacedHMSerializer):
|
|||
"""Serialize `topologie.models.Port` objects
|
||||
"""
|
||||
|
||||
get_port_profil = NamespacedHIField(view_name='portprofile-detail', read_only=True)
|
||||
get_port_profile = NamespacedHIField(view_name='portprofile-detail', read_only=True)
|
||||
|
||||
class Meta:
|
||||
model = topologie.Port
|
||||
fields = ('switch', 'port', 'room', 'machine_interface', 'related',
|
||||
'custom_profile', 'state', 'get_port_profil', 'details', 'api_url')
|
||||
'custom_profile', 'state', 'get_port_profile', 'details', 'api_url')
|
||||
extra_kwargs = {
|
||||
'related': {'view_name': 'switchport-detail'},
|
||||
'api_url': {'view_name': 'switchport-detail'},
|
||||
|
@ -735,12 +735,12 @@ class SwitchBaySerializer(NamespacedHMSerializer):
|
|||
class PortsSerializer(NamespacedHMSerializer):
|
||||
"""Serialize `machines.models.Ipv6List` objects.
|
||||
"""
|
||||
get_port_profil = ProfilSerializer(read_only=True)
|
||||
get_port_profile = ProfilSerializer(read_only=True)
|
||||
|
||||
|
||||
class Meta:
|
||||
model = topologie.Port
|
||||
fields = ('state', 'port', 'pretty_name', 'get_port_profil')
|
||||
fields = ('state', 'port', 'pretty_name', 'get_port_profile')
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -542,7 +542,7 @@ class Port(AclMixin, RevMixin, models.Model):
|
|||
return "Inconnue"
|
||||
|
||||
@cached_property
|
||||
def get_port_profil(self):
|
||||
def get_port_profile(self):
|
||||
"""Return the config profil for this port
|
||||
:returns: the profile of self (port)"""
|
||||
def profile_or_nothing(profile):
|
||||
|
|
|
@ -91,7 +91,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% if not port.custom_profil %}
|
||||
<u>{% trans "Default: " %}</u>
|
||||
{% endif %}
|
||||
{{ port.get_port_profil }}
|
||||
{{ port.get_port_profile }}
|
||||
</td>
|
||||
<td>{{ port.details }}</td>
|
||||
<td class="text-right">
|
||||
|
|
Loading…
Reference in a new issue