NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-23 07:56:44 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

#9935 add new wireless interfaces to constants

Browse Source
This commit is contained in:
Arthur 2022-08-24 10:19:15 -07:00
parent 4a94467ee6
commit 972145ff1b
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/choices.py
View File

@ -792,7 +792,7 @@ class InterfaceTypeChoices(ChoiceSet):
TYPE_80211AX = 'ieee802.11ax' TYPE_80211AX = 'ieee802.11ax'
TYPE_80211AY = 'ieee802.11ay' TYPE_80211AY = 'ieee802.11ay'
TYPE_802151 = 'ieee802.15.1' TYPE_802151 = 'ieee802.15.1'
TYPE_OTHER_WIRELESS = 'other-Wireless' TYPE_OTHER_WIRELESS = 'other-wireless'
# Cellular # Cellular
TYPE_GSM = 'gsm' TYPE_GSM = 'gsm'

3
netbox/dcim/constants.py
View File

@ -45,6 +45,9 @@ WIRELESS_IFACE_TYPES = [
InterfaceTypeChoices.TYPE_80211AC, InterfaceTypeChoices.TYPE_80211AC,
InterfaceTypeChoices.TYPE_80211AD, InterfaceTypeChoices.TYPE_80211AD,
InterfaceTypeChoices.TYPE_80211AX, InterfaceTypeChoices.TYPE_80211AX,
InterfaceTypeChoices.TYPE_80211AY,
InterfaceTypeChoices.TYPE_802151,
InterfaceTypeChoices.TYPE_OTHER_WIRELESS,
] ]
NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES

15
netbox/templates/login.html
View File

@ -42,10 +42,17 @@
{% if auth_backends %} {% if auth_backends %}
<h6 class="mt-4 mb-3">Or use a single sign-on (SSO) provider:</h6> <h6 class="mt-4 mb-3">Or use a single sign-on (SSO) provider:</h6>
{% for name, display in auth_backends.items %} {% for name, display in auth_backends.items %}
<h5> {% if name == 'saml' %}
{% if display.1 %}<i class="mdi mdi-{{ display.1 }}"></i>{% endif %} <h5>
<a href="{% url 'social:begin' backend=name %}" class="my-2">{{ display.0 }}</a> {% if display.1 %}<i class="mdi mdi-{{ display.1 }}"></i>{% endif %}
</h5> <a href="{% url 'social:begin' backend=name %}" class="my-2">{{ display.0 }}</a>
</h5>
{% else %}
<h5>
{% if display.1 %}<i class="mdi mdi-{{ display.1 }}"></i>{% endif %}
<a href="{% url 'social:begin' backend=name %}" class="my-2">{{ display.0 }}</a>
</h5>
{% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}

25
netbox/wireless/migrations/0005_alter_wirelesslink_interface_a_and_more.py Normal file
View File

@ -0,0 +1,25 @@
# Generated by Django 4.0.7 on 2022-08-24 17:18
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('dcim', '0161_cabling_cleanup'),
('wireless', '0004_wireless_tenancy'),
]
operations = [
migrations.AlterField(
model_name='wirelesslink',
name='interface_a',
field=models.ForeignKey(limit_choices_to={'type__in': ['ieee802.11a', 'ieee802.11g', 'ieee802.11n', 'ieee802.11ac', 'ieee802.11ad', 'ieee802.11ax', 'ieee802.11ay', 'ieee802.15.1', 'other-wireless']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.interface'),
),
migrations.AlterField(
model_name='wirelesslink',
name='interface_b',
field=models.ForeignKey(limit_choices_to={'type__in': ['ieee802.11a', 'ieee802.11g', 'ieee802.11n', 'ieee802.11ac', 'ieee802.11ad', 'ieee802.11ax', 'ieee802.11ay', 'ieee802.15.1', 'other-wireless']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.interface'),
),
]