NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' into 16837-filter-cable-type-empty

Browse Source
This commit is contained in:
Brian Tiemann 2024-09-18 15:09:17 -04:00
commit ffcc640013
10 changed files with 120 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/close-stale-issues.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
- uses: actions/stale@v9 - uses: actions/stale@v9
with: with:
# General parameters # General parameters
operations-per-run: 100 operations-per-run: 200
remove-stale-when-updated: false remove-stale-when-updated: false
# Issue parameters # Issue parameters
@ -43,7 +43,7 @@ jobs:
# Pull request parameters # Pull request parameters
close-pr-message: > close-pr-message: >
This PR has been automatically closed due to lack of activity. This PR has been automatically closed due to lack of activity.
days-before-pr-stale: 15 days-before-pr-stale: 30
days-before-pr-close: 15 days-before-pr-close: 15
exempt-pr-labels: 'status: blocked' exempt-pr-labels: 'status: blocked'
stale-pr-label: 'pending closure' stale-pr-label: 'pending closure'

18
docs/_theme/partials/copyright.html vendored Normal file
View File

@ -0,0 +1,18 @@
<div class="md-copyright">
{% if config.copyright %}
<div class="md-copyright__highlight">
{{ config.copyright }}
</div>
{% endif %}
{% if not config.extra.generator == false %}
Made with
<a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener">
Material for MkDocs
</a>
{% endif %}
</div>
{% if not config.extra.build_public %}
<div class="md-copyright">
ℹ️ Documentation is being served locally
</div>
{% endif %}

14
netbox/core/management/commands/nbshell.py
View File

@ -11,6 +11,10 @@ from core.models import ObjectType
from users.models import User from users.models import User
APPS = ('circuits', 'core', 'dcim', 'extras', 'ipam', 'tenancy', 'users', 'virtualization', 'vpn', 'wireless') APPS = ('circuits', 'core', 'dcim', 'extras', 'ipam', 'tenancy', 'users', 'virtualization', 'vpn', 'wireless')
EXCLUDE_MODELS = (
'extras.branch',
'extras.stagedchange',
)
BANNER_TEXT = """### NetBox interactive shell ({node}) BANNER_TEXT = """### NetBox interactive shell ({node})
### Python {python} | Django {django} | NetBox {netbox} ### Python {python} | Django {django} | NetBox {netbox}
@ -44,12 +48,16 @@ class Command(BaseCommand):
# Gather Django models and constants from each app # Gather Django models and constants from each app
for app in APPS: for app in APPS:
self.django_models[app] = [] models = []
# Load models from each app # Load models from each app
for model in apps.get_app_config(app).get_models(): for model in apps.get_app_config(app).get_models():
namespace[model.__name__] = model app_label = model._meta.app_label
self.django_models[app].append(model.__name__) model_name = model._meta.model_name
if f'{app_label}.{model_name}' not in EXCLUDE_MODELS:
namespace[model.__name__] = model
models.append(model.__name__)
self.django_models[app] = sorted(models)
# Constants # Constants
try: try:

2
netbox/dcim/choices.py
View File

@ -685,6 +685,7 @@ class PowerOutletTypeChoices(ChoiceSet):
# Direct current (DC) # Direct current (DC)
TYPE_DC = 'dc-terminal' TYPE_DC = 'dc-terminal'
# Proprietary # Proprietary
TYPE_EATON_C39 = 'eaton-c39'
TYPE_HDOT_CX = 'hdot-cx' TYPE_HDOT_CX = 'hdot-cx'
TYPE_SAF_D_GRID = 'saf-d-grid' TYPE_SAF_D_GRID = 'saf-d-grid'
TYPE_NEUTRIK_POWERCON_20A = 'neutrik-powercon-20a' TYPE_NEUTRIK_POWERCON_20A = 'neutrik-powercon-20a'
@ -806,6 +807,7 @@ class PowerOutletTypeChoices(ChoiceSet):
(TYPE_DC, 'DC Terminal'), (TYPE_DC, 'DC Terminal'),
)), )),
(_('Proprietary'), ( (_('Proprietary'), (
(TYPE_EATON_C39, 'Eaton C39'),
(TYPE_HDOT_CX, 'HDOT Cx'), (TYPE_HDOT_CX, 'HDOT Cx'),
(TYPE_SAF_D_GRID, 'Saf-D-Grid'), (TYPE_SAF_D_GRID, 'Saf-D-Grid'),
(TYPE_NEUTRIK_POWERCON_20A, 'Neutrik powerCON (20A)'), (TYPE_NEUTRIK_POWERCON_20A, 'Neutrik powerCON (20A)'),

10
netbox/extras/models/customfields.py
View File

@ -294,11 +294,11 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
no longer assigned to a model, or because it has been deleted). no longer assigned to a model, or because it has been deleted).
""" """
for ct in content_types: for ct in content_types:
model = ct.model_class() if model := ct.model_class():
instances = model.objects.filter(custom_field_data__has_key=self.name) instances = model.objects.filter(custom_field_data__has_key=self.name)
for instance in instances: for instance in instances:
del instance.custom_field_data[self.name] del instance.custom_field_data[self.name]
model.objects.bulk_update(instances, ['custom_field_data'], batch_size=100) model.objects.bulk_update(instances, ['custom_field_data'], batch_size=100)
def rename_object_data(self, old_name, new_name): def rename_object_data(self, old_name, new_name):
""" """

17
netbox/netbox/api/serializers/fields.py
View File

@ -1,5 +1,8 @@
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from utilities.views import get_viewname
__all__ = ( __all__ = (
'NetBoxAPIHyperlinkedIdentityField', 'NetBoxAPIHyperlinkedIdentityField',
'NetBoxURLHyperlinkedIdentityField', 'NetBoxURLHyperlinkedIdentityField',
@ -30,12 +33,10 @@ class BaseNetBoxHyperlinkedIdentityField(serializers.HyperlinkedIdentityField):
lookup_value = getattr(obj, self.lookup_field) lookup_value = getattr(obj, self.lookup_field)
kwargs = {self.lookup_url_kwarg: lookup_value} kwargs = {self.lookup_url_kwarg: lookup_value}
model_name = self.parent.Meta.model._meta.model_name view_name = self.get_view_name(obj)
app_name = self.parent.Meta.model._meta.app_label
view_name = self.get_view_name(app_name, model_name)
return self.reverse(view_name, kwargs=kwargs, request=request, format=format) return self.reverse(view_name, kwargs=kwargs, request=request, format=format)
def get_view_name(self, app_name, model_name): def get_view_name(self, model):
raise NotImplementedError(_('{class_name} must implement get_view_name()').format( raise NotImplementedError(_('{class_name} must implement get_view_name()').format(
class_name=self.__class__.__name__ class_name=self.__class__.__name__
)) ))
@ -43,11 +44,11 @@ class BaseNetBoxHyperlinkedIdentityField(serializers.HyperlinkedIdentityField):
class NetBoxAPIHyperlinkedIdentityField(BaseNetBoxHyperlinkedIdentityField): class NetBoxAPIHyperlinkedIdentityField(BaseNetBoxHyperlinkedIdentityField):
def get_view_name(self, app_name, model_name): def get_view_name(self, model):
return f'{app_name}-api:{model_name}-detail' return get_viewname(model=model, action='detail', rest_api=True)
class NetBoxURLHyperlinkedIdentityField(BaseNetBoxHyperlinkedIdentityField): class NetBoxURLHyperlinkedIdentityField(BaseNetBoxHyperlinkedIdentityField):
def get_view_name(self, app_name, model_name): def get_view_name(self, model):
return f'{app_name}:{model_name}' return get_viewname(model=model)

BIN
netbox/project-static/dist/netbox.css vendored
View File

Binary file not shown.

2
netbox/project-static/package.json
View File

@ -24,7 +24,7 @@
"dependencies": { "dependencies": {
"@fontsource-variable/plus-jakarta-sans": "^5.1.0", "@fontsource-variable/plus-jakarta-sans": "^5.1.0",
"@mdi/font": "7.4.47", "@mdi/font": "7.4.47",
"@tabler/core": "1.0.0-beta20", "@tabler/core": "1.0.0-beta21",
"bootstrap": "5.3.3", "bootstrap": "5.3.3",
"clipboard": "2.0.11", "clipboard": "2.0.11",
"flatpickr": "4.6.13", "flatpickr": "4.6.13",

25
netbox/project-static/yarn.lock
View File

@ -675,19 +675,19 @@
resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g== integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
"@tabler/core@1.0.0-beta20": "@tabler/core@1.0.0-beta21":
version "1.0.0-beta20" version "1.0.0-beta21"
resolved "https://registry.yarnpkg.com/@tabler/core/-/core-1.0.0-beta20.tgz#3fcc3b5634ca89a413ba9c077df7bdfc531ab93c" resolved "https://registry.yarnpkg.com/@tabler/core/-/core-1.0.0-beta21.tgz#cd10d7648b3b7b31927a430fd776d3304e796403"
integrity sha512-OzKpur+Ug7e+HMbNJrMcSuWZGUsJTvu7HYboBNRE8qyo1RKIWqvwL5YewKBJ+odW5pDOqBPzbsS4je3EBQQxHw== integrity sha512-9ZKu38BScc0eHruhX/SlVDSiXenBFSgBp2WDq6orkuC8J/1yutKDt7CdXuJpBwkiADEk5yqYV31Ku+CnhwOc3Q==
dependencies: dependencies:
"@popperjs/core" "^2.11.8" "@popperjs/core" "^2.11.8"
"@tabler/icons" "^2.32.0" "@tabler/icons" "^3.14.0"
bootstrap "5.3.1" bootstrap "5.3.3"
"@tabler/icons@^2.32.0": "@tabler/icons@^3.14.0":
version "2.47.0" version "3.16.0"
resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-2.47.0.tgz#c41c680d1947e3ab2d60af3febc4132287c60596" resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-3.16.0.tgz#d618670b80163925a31a6c2290e8775f6058d81a"
integrity sha512-4w5evLh+7FUUiA1GucvGj2ReX2TvOjEr4ejXdwL/bsjoSkof6r1gQmzqI+VHrE2CpJpB3al7bCTulOkFa/RcyA== integrity sha512-GU7MSx4uQEr55BmyON6hD/QYTl6k1v0YlRhM91gBWDoKAbyCt6QIYw7rpJ/ecdh5zrHaTOJKPenZ4+luoutwFA==
"@tanstack/react-virtual@^3.0.0-beta.60": "@tanstack/react-virtual@^3.0.0-beta.60":
version "3.5.0" version "3.5.0"
@ -977,11 +977,6 @@ binary-extensions@^2.0.0:
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
bootstrap@5.3.1:
version "5.3.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.1.tgz#8ca07040ad15d7f75891d1504cf14c5dedfb1cfe"
integrity sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==
bootstrap@5.3.3: bootstrap@5.3.3:
version "5.3.3" version "5.3.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38"

124
netbox/translations/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-12 05:02+0000\n" "POT-Creation-Date: 2024-09-18 05:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -82,8 +82,8 @@ msgstr ""
#: netbox/circuits/choices.py:21 netbox/dcim/choices.py:20 #: netbox/circuits/choices.py:21 netbox/dcim/choices.py:20
#: netbox/dcim/choices.py:102 netbox/dcim/choices.py:185 #: netbox/dcim/choices.py:102 netbox/dcim/choices.py:185
#: netbox/dcim/choices.py:231 netbox/dcim/choices.py:1518 #: netbox/dcim/choices.py:231 netbox/dcim/choices.py:1520
#: netbox/dcim/choices.py:1594 netbox/dcim/choices.py:1644 #: netbox/dcim/choices.py:1596 netbox/dcim/choices.py:1646
#: netbox/virtualization/choices.py:20 netbox/virtualization/choices.py:45 #: netbox/virtualization/choices.py:20 netbox/virtualization/choices.py:45
#: netbox/vpn/choices.py:18 #: netbox/vpn/choices.py:18
msgid "Planned" msgid "Planned"
@ -96,7 +96,7 @@ msgstr ""
#: netbox/circuits/choices.py:23 netbox/core/tables/tasks.py:22 #: netbox/circuits/choices.py:23 netbox/core/tables/tasks.py:22
#: netbox/dcim/choices.py:22 netbox/dcim/choices.py:103 #: netbox/dcim/choices.py:22 netbox/dcim/choices.py:103
#: netbox/dcim/choices.py:184 netbox/dcim/choices.py:230 #: netbox/dcim/choices.py:184 netbox/dcim/choices.py:230
#: netbox/dcim/choices.py:1593 netbox/dcim/choices.py:1643 #: netbox/dcim/choices.py:1595 netbox/dcim/choices.py:1645
#: netbox/extras/tables/tables.py:495 netbox/ipam/choices.py:31 #: netbox/extras/tables/tables.py:495 netbox/ipam/choices.py:31
#: netbox/ipam/choices.py:49 netbox/ipam/choices.py:69 #: netbox/ipam/choices.py:49 netbox/ipam/choices.py:69
#: netbox/ipam/choices.py:154 netbox/templates/extras/configcontext.html:25 #: netbox/ipam/choices.py:154 netbox/templates/extras/configcontext.html:25
@ -107,8 +107,8 @@ msgid "Active"
msgstr "" msgstr ""
#: netbox/circuits/choices.py:24 netbox/dcim/choices.py:183 #: netbox/circuits/choices.py:24 netbox/dcim/choices.py:183
#: netbox/dcim/choices.py:229 netbox/dcim/choices.py:1592 #: netbox/dcim/choices.py:229 netbox/dcim/choices.py:1594
#: netbox/dcim/choices.py:1645 netbox/virtualization/choices.py:24 #: netbox/dcim/choices.py:1647 netbox/virtualization/choices.py:24
#: netbox/virtualization/choices.py:43 #: netbox/virtualization/choices.py:43
msgid "Offline" msgid "Offline"
msgstr "" msgstr ""
@ -121,7 +121,7 @@ msgstr ""
msgid "Decommissioned" msgid "Decommissioned"
msgstr "" msgstr ""
#: netbox/circuits/choices.py:90 netbox/dcim/choices.py:1605 #: netbox/circuits/choices.py:90 netbox/dcim/choices.py:1607
#: netbox/tenancy/choices.py:17 #: netbox/tenancy/choices.py:17
msgid "Primary" msgid "Primary"
msgstr "" msgstr ""
@ -1587,7 +1587,7 @@ msgstr ""
#: netbox/core/choices.py:22 netbox/core/choices.py:59 #: netbox/core/choices.py:22 netbox/core/choices.py:59
#: netbox/core/constants.py:20 netbox/core/tables/tasks.py:34 #: netbox/core/constants.py:20 netbox/core/tables/tasks.py:34
#: netbox/dcim/choices.py:187 netbox/dcim/choices.py:233 #: netbox/dcim/choices.py:187 netbox/dcim/choices.py:233
#: netbox/dcim/choices.py:1595 netbox/virtualization/choices.py:47 #: netbox/dcim/choices.py:1597 netbox/virtualization/choices.py:47
msgid "Failed" msgid "Failed"
msgstr "" msgstr ""
@ -1911,7 +1911,7 @@ msgstr ""
msgid "Rack Elevations" msgid "Rack Elevations"
msgstr "" msgstr ""
#: netbox/core/forms/model_forms.py:157 netbox/dcim/choices.py:1506 #: netbox/core/forms/model_forms.py:157 netbox/dcim/choices.py:1508
#: netbox/dcim/forms/bulk_edit.py:969 netbox/dcim/forms/bulk_edit.py:1357 #: netbox/dcim/forms/bulk_edit.py:969 netbox/dcim/forms/bulk_edit.py:1357
#: netbox/dcim/forms/bulk_edit.py:1375 netbox/dcim/tables/racks.py:158 #: netbox/dcim/forms/bulk_edit.py:1375 netbox/dcim/tables/racks.py:158
#: netbox/netbox/navigation/menu.py:291 netbox/netbox/navigation/menu.py:295 #: netbox/netbox/navigation/menu.py:291 netbox/netbox/navigation/menu.py:295
@ -2477,7 +2477,7 @@ msgid "Staging"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:23 netbox/dcim/choices.py:189 #: netbox/dcim/choices.py:23 netbox/dcim/choices.py:189
#: netbox/dcim/choices.py:234 netbox/dcim/choices.py:1519 #: netbox/dcim/choices.py:234 netbox/dcim/choices.py:1521
#: netbox/virtualization/choices.py:23 netbox/virtualization/choices.py:48 #: netbox/virtualization/choices.py:23 netbox/virtualization/choices.py:48
msgid "Decommissioning" msgid "Decommissioning"
msgstr "" msgstr ""
@ -2541,7 +2541,7 @@ msgstr ""
msgid "Millimeters" msgid "Millimeters"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:115 netbox/dcim/choices.py:1541 #: netbox/dcim/choices.py:115 netbox/dcim/choices.py:1543
msgid "Inches" msgid "Inches"
msgstr "" msgstr ""
@ -2630,7 +2630,7 @@ msgid "Side to rear"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:209 netbox/dcim/choices.py:253 #: netbox/dcim/choices.py:209 netbox/dcim/choices.py:253
#: netbox/dcim/choices.py:1291 #: netbox/dcim/choices.py:1293
msgid "Passive" msgid "Passive"
msgstr "" msgstr ""
@ -2638,15 +2638,15 @@ msgstr ""
msgid "Mixed" msgid "Mixed"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:478 netbox/dcim/choices.py:726 #: netbox/dcim/choices.py:478 netbox/dcim/choices.py:727
msgid "NEMA (Non-locking)" msgid "NEMA (Non-locking)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:500 netbox/dcim/choices.py:748 #: netbox/dcim/choices.py:500 netbox/dcim/choices.py:749
msgid "NEMA (Locking)" msgid "NEMA (Locking)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:524 netbox/dcim/choices.py:772 #: netbox/dcim/choices.py:524 netbox/dcim/choices.py:773
msgid "California Style" msgid "California Style"
msgstr "" msgstr ""
@ -2654,30 +2654,30 @@ msgstr ""
msgid "International/ITA" msgid "International/ITA"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:567 netbox/dcim/choices.py:807 #: netbox/dcim/choices.py:567 netbox/dcim/choices.py:808
msgid "Proprietary" msgid "Proprietary"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:575 netbox/dcim/choices.py:816 #: netbox/dcim/choices.py:575 netbox/dcim/choices.py:818
#: netbox/dcim/choices.py:1207 netbox/dcim/choices.py:1209 #: netbox/dcim/choices.py:1209 netbox/dcim/choices.py:1211
#: netbox/dcim/choices.py:1435 netbox/dcim/choices.py:1437 #: netbox/dcim/choices.py:1437 netbox/dcim/choices.py:1439
#: netbox/netbox/navigation/menu.py:200 #: netbox/netbox/navigation/menu.py:200
msgid "Other" msgid "Other"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:780 #: netbox/dcim/choices.py:781
msgid "ITA/International" msgid "ITA/International"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:846 #: netbox/dcim/choices.py:848
msgid "Physical" msgid "Physical"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:847 netbox/dcim/choices.py:1013 #: netbox/dcim/choices.py:849 netbox/dcim/choices.py:1015
msgid "Virtual" msgid "Virtual"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:848 netbox/dcim/choices.py:1086 #: netbox/dcim/choices.py:850 netbox/dcim/choices.py:1088
#: netbox/dcim/forms/bulk_edit.py:1515 netbox/dcim/forms/filtersets.py:1330 #: netbox/dcim/forms/bulk_edit.py:1515 netbox/dcim/forms/filtersets.py:1330
#: netbox/dcim/forms/model_forms.py:988 netbox/dcim/forms/model_forms.py:1396 #: netbox/dcim/forms/model_forms.py:988 netbox/dcim/forms/model_forms.py:1396
#: netbox/netbox/navigation/menu.py:140 netbox/netbox/navigation/menu.py:144 #: netbox/netbox/navigation/menu.py:140 netbox/netbox/navigation/menu.py:144
@ -2685,11 +2685,11 @@ msgstr ""
msgid "Wireless" msgid "Wireless"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1011 #: netbox/dcim/choices.py:1013
msgid "Virtual interfaces" msgid "Virtual interfaces"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1014 netbox/dcim/forms/bulk_edit.py:1410 #: netbox/dcim/choices.py:1016 netbox/dcim/forms/bulk_edit.py:1410
#: netbox/dcim/forms/bulk_import.py:840 netbox/dcim/forms/model_forms.py:974 #: netbox/dcim/forms/bulk_import.py:840 netbox/dcim/forms/model_forms.py:974
#: netbox/dcim/tables/devices.py:657 netbox/templates/dcim/interface.html:106 #: netbox/dcim/tables/devices.py:657 netbox/templates/dcim/interface.html:106
#: netbox/templates/virtualization/vminterface.html:43 #: netbox/templates/virtualization/vminterface.html:43
@ -2699,27 +2699,27 @@ msgstr ""
msgid "Bridge" msgid "Bridge"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1015 #: netbox/dcim/choices.py:1017
msgid "Link Aggregation Group (LAG)" msgid "Link Aggregation Group (LAG)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1019 #: netbox/dcim/choices.py:1021
msgid "Ethernet (fixed)" msgid "Ethernet (fixed)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1034 #: netbox/dcim/choices.py:1036
msgid "Ethernet (modular)" msgid "Ethernet (modular)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1070 #: netbox/dcim/choices.py:1072
msgid "Ethernet (backplane)" msgid "Ethernet (backplane)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1101 #: netbox/dcim/choices.py:1103
msgid "Cellular" msgid "Cellular"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1153 netbox/dcim/forms/filtersets.py:383 #: netbox/dcim/choices.py:1155 netbox/dcim/forms/filtersets.py:383
#: netbox/dcim/forms/filtersets.py:809 netbox/dcim/forms/filtersets.py:963 #: netbox/dcim/forms/filtersets.py:809 netbox/dcim/forms/filtersets.py:963
#: netbox/dcim/forms/filtersets.py:1542 #: netbox/dcim/forms/filtersets.py:1542
#: netbox/templates/dcim/inventoryitem.html:52 #: netbox/templates/dcim/inventoryitem.html:52
@ -2727,129 +2727,129 @@ msgstr ""
msgid "Serial" msgid "Serial"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1168 #: netbox/dcim/choices.py:1170
msgid "Coaxial" msgid "Coaxial"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1188 #: netbox/dcim/choices.py:1190
msgid "Stacking" msgid "Stacking"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1238 #: netbox/dcim/choices.py:1240
msgid "Half" msgid "Half"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1239 #: netbox/dcim/choices.py:1241
msgid "Full" msgid "Full"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1240 netbox/netbox/preferences.py:31 #: netbox/dcim/choices.py:1242 netbox/netbox/preferences.py:31
#: netbox/wireless/choices.py:480 #: netbox/wireless/choices.py:480
msgid "Auto" msgid "Auto"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1251 #: netbox/dcim/choices.py:1253
msgid "Access" msgid "Access"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1252 netbox/ipam/tables/vlans.py:172 #: netbox/dcim/choices.py:1254 netbox/ipam/tables/vlans.py:172
#: netbox/ipam/tables/vlans.py:217 #: netbox/ipam/tables/vlans.py:217
#: netbox/templates/dcim/inc/interface_vlans_table.html:7 #: netbox/templates/dcim/inc/interface_vlans_table.html:7
msgid "Tagged" msgid "Tagged"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1253 #: netbox/dcim/choices.py:1255
msgid "Tagged (All)" msgid "Tagged (All)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1282 #: netbox/dcim/choices.py:1284
msgid "IEEE Standard" msgid "IEEE Standard"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1293 #: netbox/dcim/choices.py:1295
msgid "Passive 24V (2-pair)" msgid "Passive 24V (2-pair)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1294 #: netbox/dcim/choices.py:1296
msgid "Passive 24V (4-pair)" msgid "Passive 24V (4-pair)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1295 #: netbox/dcim/choices.py:1297
msgid "Passive 48V (2-pair)" msgid "Passive 48V (2-pair)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1296 #: netbox/dcim/choices.py:1298
msgid "Passive 48V (4-pair)" msgid "Passive 48V (4-pair)"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1366 netbox/dcim/choices.py:1476 #: netbox/dcim/choices.py:1368 netbox/dcim/choices.py:1478
msgid "Copper" msgid "Copper"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1389 #: netbox/dcim/choices.py:1391
msgid "Fiber Optic" msgid "Fiber Optic"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1422 netbox/dcim/choices.py:1505 #: netbox/dcim/choices.py:1424 netbox/dcim/choices.py:1507
msgid "USB" msgid "USB"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1492 #: netbox/dcim/choices.py:1494
msgid "Fiber" msgid "Fiber"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1517 netbox/dcim/forms/filtersets.py:1227 #: netbox/dcim/choices.py:1519 netbox/dcim/forms/filtersets.py:1227
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1536 netbox/wireless/choices.py:497 #: netbox/dcim/choices.py:1538 netbox/wireless/choices.py:497
msgid "Kilometers" msgid "Kilometers"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1537 netbox/templates/dcim/cable_trace.html:65 #: netbox/dcim/choices.py:1539 netbox/templates/dcim/cable_trace.html:65
#: netbox/wireless/choices.py:498 #: netbox/wireless/choices.py:498
msgid "Meters" msgid "Meters"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1538 #: netbox/dcim/choices.py:1540
msgid "Centimeters" msgid "Centimeters"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1539 netbox/wireless/choices.py:499 #: netbox/dcim/choices.py:1541 netbox/wireless/choices.py:499
msgid "Miles" msgid "Miles"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1540 netbox/templates/dcim/cable_trace.html:66 #: netbox/dcim/choices.py:1542 netbox/templates/dcim/cable_trace.html:66
#: netbox/wireless/choices.py:500 #: netbox/wireless/choices.py:500
msgid "Feet" msgid "Feet"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1556 netbox/templates/dcim/device.html:327 #: netbox/dcim/choices.py:1558 netbox/templates/dcim/device.html:327
#: netbox/templates/dcim/rack.html:106 #: netbox/templates/dcim/rack.html:106
msgid "Kilograms" msgid "Kilograms"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1557 #: netbox/dcim/choices.py:1559
msgid "Grams" msgid "Grams"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1558 netbox/templates/dcim/rack.html:107 #: netbox/dcim/choices.py:1560 netbox/templates/dcim/rack.html:107
msgid "Pounds" msgid "Pounds"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1559 #: netbox/dcim/choices.py:1561
msgid "Ounces" msgid "Ounces"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1606 #: netbox/dcim/choices.py:1608
msgid "Redundant" msgid "Redundant"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1627 #: netbox/dcim/choices.py:1629
msgid "Single phase" msgid "Single phase"
msgstr "" msgstr ""
#: netbox/dcim/choices.py:1628 #: netbox/dcim/choices.py:1630
msgid "Three-phase" msgid "Three-phase"
msgstr "" msgstr ""
@ -10097,7 +10097,7 @@ msgstr ""
msgid "Range boundaries must be defined as integers." msgid "Range boundaries must be defined as integers."
msgstr "" msgstr ""
#: netbox/netbox/api/serializers/fields.py:39 #: netbox/netbox/api/serializers/fields.py:40
#, python-brace-format #, python-brace-format
msgid "{class_name} must implement get_view_name()" msgid "{class_name} must implement get_view_name()"
msgstr "" msgstr ""