mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-23 12:08:43 -06:00
Compare commits
6 Commits
21202-scop
...
19129-mac-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
087a2adb3c | ||
|
|
a145dbc44a | ||
|
|
9b1f033c73 | ||
|
|
60e37e868b | ||
|
|
c1287de970 | ||
|
|
3891b2a25f |
@@ -75,7 +75,7 @@ class ScopedForm(forms.Form):
|
|||||||
except ObjectDoesNotExist:
|
except ObjectDoesNotExist:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if self.instance and self.instance.pk and scope_type_id != self.instance.scope_type_id:
|
if self.instance and scope_type_id != self.instance.scope_type_id:
|
||||||
self.initial['scope'] = None
|
self.initial['scope'] = None
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -732,6 +732,25 @@ class BaseInterface(models.Model):
|
|||||||
if self.primary_mac_address:
|
if self.primary_mac_address:
|
||||||
return self.primary_mac_address.mac_address
|
return self.primary_mac_address.mac_address
|
||||||
|
|
||||||
|
@property
|
||||||
|
def mac_address_display(self):
|
||||||
|
"""
|
||||||
|
Rich representation of MAC addresses for use in table columns (e.g. InterfaceTable).
|
||||||
|
Handles various configurations of MAC addresses for an interface:
|
||||||
|
11:22:33:44:55:66 <-- Single MAC address on interface, assigned as primary
|
||||||
|
11:22:33:44:55:66 (2) <-- Multiple MAC addresses on interface, one assigned as primary
|
||||||
|
2 available <-- 1 or more MAC addresses on interface, none assigned as primary
|
||||||
|
- <-- No MAC addresses on interface
|
||||||
|
"""
|
||||||
|
available_mac_count = self.mac_addresses.count()
|
||||||
|
if self.primary_mac_address:
|
||||||
|
if available_mac_count > 1:
|
||||||
|
return f"{self.primary_mac_address} ({available_mac_count})"
|
||||||
|
return self.primary_mac_address
|
||||||
|
if available_mac_count:
|
||||||
|
return f"{available_mac_count} available"
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
class Interface(
|
class Interface(
|
||||||
InterfaceValidationMixin,
|
InterfaceValidationMixin,
|
||||||
|
|||||||
@@ -616,6 +616,7 @@ class BaseInterfaceTable(NetBoxTable):
|
|||||||
)
|
)
|
||||||
primary_mac_address = tables.Column(
|
primary_mac_address = tables.Column(
|
||||||
verbose_name=_('MAC Address'),
|
verbose_name=_('MAC Address'),
|
||||||
|
accessor=Accessor('mac_address_display'),
|
||||||
linkify=True
|
linkify=True
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -143,9 +143,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th scope="row">{% trans "MAC Address" %}</th>
|
<th scope="row">{% trans "MAC Address" %}</th>
|
||||||
<td>
|
<td>
|
||||||
{% if object.primary_mac_address %}
|
{% if object.mac_address_display %}
|
||||||
<span class="font-monospace">{{ object.primary_mac_address|linkify }}</span>
|
<span class="font-monospace">{{ object.mac_address_display|linkify }}</span>
|
||||||
<span class="badge text-bg-primary">{% trans "Primary" %}</span>
|
{% if object.primary_mac_address %}
|
||||||
|
<span class="badge text-bg-primary">{% trans "Primary" %}</span>
|
||||||
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ ''|placeholder }}
|
{{ ''|placeholder }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
@@ -78,9 +78,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th scope="row">{% trans "MAC Address" %}</th>
|
<th scope="row">{% trans "MAC Address" %}</th>
|
||||||
<td>
|
<td>
|
||||||
{% if object.mac_address %}
|
{% if object.mac_address_display %}
|
||||||
<span class="font-monospace">{{ object.mac_address }}</span>
|
<span class="font-monospace">{{ object.mac_address_display|linkify }}</span>
|
||||||
<span class="badge text-bg-primary">{% trans "Primary" %}</span>
|
{% if object.primary_mac_address %}
|
||||||
|
<span class="badge text-bg-primary">{% trans "Primary" %}</span>
|
||||||
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ ''|placeholder }}
|
{{ ''|placeholder }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user