```
+
+````
+```
+var s = "Code block";
+alert(s);
+```
+````
+
+```
+var s = "Code block";
+alert(s);
+```
+
+
+
+## Tables
+
+```no-highlight
+Colons can be used to align columns.
+
+| Tables | Are | Cool |
+| ------------- |:-------------:| -----:|
+| col 3 is | right-aligned | $1600 |
+| col 2 is | centered | $12 |
+| zebra stripes | are neat | $1 |
+
+There must be at least 3 dashes separating each header cell.
+The outer pipes (|) are optional, and you don't need to make the
+raw Markdown line up prettily. You can also use inline Markdown.
+
+Markdown | Less | Pretty
+--- | --- | ---
+*Still* | `renders` | **nicely**
+1 | 2 | 3
+```
+
+Colons can be used to align columns.
+
+| Tables | Are | Cool |
+| ------------- |:-------------:| -----:|
+| col 3 is | right-aligned | $1600 |
+| col 2 is | centered | $12 |
+| zebra stripes | are neat | $1 |
+
+There must be at least 3 dashes separating each header cell. The outer pipes (|) are optional, and you don't need to make the raw Markdown line up prettily. You can also use inline Markdown.
+
+Markdown | Less | Pretty
+--- | --- | ---
+*Still* | `renders` | **nicely**
+1 | 2 | 3
+
+
+
+## Blockquotes
+
+```no-highlight
+> Blockquotes are very handy in email to emulate reply text.
+> This line is part of the same quote.
+
+Quote break.
+
+> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote.
+```
+
+> Blockquotes are very handy in email to emulate reply text.
+> This line is part of the same quote.
+
+Quote break.
+
+> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote.
+
+
+
+## Inline HTML
+
+You can also use raw HTML in your Markdown, and it'll mostly work pretty well.
+
+```no-highlight
+-
+
- Definition list +
- Is something people use sometimes. + +
- Markdown in HTML +
- Does *not* work **very** well. Use HTML tags. +
-
+
- Definition list +
- Is something people use sometimes. + +
- Markdown in HTML +
- Does *not* work **very** well. Use HTML tags. +
' + self.fields[field_name].help_text += ' ' \ + 'Field is set to read-only.' + # Annotate the field in the list of CustomField form fields self.custom_fields[field_name] = customfield diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index 5d66c8be8ed..56f48f96bcb 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -3,7 +3,7 @@ from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.utils.translation import gettext as _ -from dcim.models import DeviceRole, DeviceType, Platform, Region, Site, SiteGroup +from dcim.models import DeviceRole, DeviceType, Location, Platform, Region, Site, SiteGroup from extras.choices import * from extras.models import * from extras.utils import FeatureQuery @@ -32,7 +32,7 @@ __all__ = ( class CustomFieldFilterForm(FilterForm): fieldsets = ( (None, ('q',)), - ('Attributes', ('type', 'content_types', 'weight', 'required')), + ('Attributes', ('content_types', 'type', 'group_name', 'weight', 'required', 'ui_visibility')), ) content_types = ContentTypeMultipleChoiceField( queryset=ContentType.objects.all(), @@ -44,6 +44,9 @@ class CustomFieldFilterForm(FilterForm): required=False, label=_('Field type') ) + group_name = forms.CharField( + required=False + ) weight = forms.IntegerField( required=False ) @@ -53,6 +56,12 @@ class CustomFieldFilterForm(FilterForm): choices=BOOLEAN_WITH_BLANK_CHOICES ) ) + ui_visibility = forms.ChoiceField( + choices=add_blank_choice(CustomFieldVisibilityChoices), + required=False, + label=_('UI visibility'), + widget=StaticSelect() + ) class CustomLinkFilterForm(FilterForm): @@ -161,7 +170,7 @@ class TagFilterForm(FilterForm): class ConfigContextFilterForm(FilterForm): fieldsets = ( (None, ('q', 'tag_id')), - ('Location', ('region_id', 'site_group_id', 'site_id')), + ('Location', ('region_id', 'site_group_id', 'site_id', 'location_id')), ('Device', ('device_type_id', 'platform_id', 'role_id')), ('Cluster', ('cluster_type_id', 'cluster_group_id', 'cluster_id')), ('Tenant', ('tenant_group_id', 'tenant_id')) @@ -181,6 +190,11 @@ class ConfigContextFilterForm(FilterForm): required=False, label=_('Sites') ) + location_id = DynamicModelMultipleChoiceField( + queryset=Location.objects.all(), + required=False, + label=_('Locations') + ) device_type_id = DynamicModelMultipleChoiceField( queryset=DeviceType.objects.all(), required=False, diff --git a/netbox/extras/forms/models.py b/netbox/extras/forms/models.py index 112911f42af..1ef723e93e6 100644 --- a/netbox/extras/forms/models.py +++ b/netbox/extras/forms/models.py @@ -1,7 +1,7 @@ from django import forms from django.contrib.contenttypes.models import ContentType -from dcim.models import DeviceRole, DeviceType, Platform, Region, Site, SiteGroup +from dcim.models import DeviceRole, DeviceType, Location, Platform, Region, Site, SiteGroup from extras.choices import * from extras.models import * from extras.utils import FeatureQuery @@ -40,8 +40,10 @@ class CustomFieldForm(BootstrapMixin, forms.ModelForm): ) fieldsets = ( - ('Custom Field', ('content_types', 'name', 'label', 'type', 'object_type', 'weight', 'required', 'description')), - ('Behavior', ('filter_logic',)), + ('Custom Field', ( + 'content_types', 'name', 'label', 'group_name', 'type', 'object_type', 'weight', 'required', 'description', + )), + ('Behavior', ('filter_logic', 'ui_visibility')), ('Values', ('default', 'choices')), ('Validation', ('validation_minimum', 'validation_maximum', 'validation_regex')), ) @@ -56,6 +58,7 @@ class CustomFieldForm(BootstrapMixin, forms.ModelForm): widgets = { 'type': StaticSelect(), 'filter_logic': StaticSelect(), + 'ui_visibility': StaticSelect(), } @@ -163,6 +166,10 @@ class ConfigContextForm(BootstrapMixin, forms.ModelForm): queryset=Site.objects.all(), required=False ) + locations = DynamicModelMultipleChoiceField( + queryset=Location.objects.all(), + required=False + ) device_types = DynamicModelMultipleChoiceField( queryset=DeviceType.objects.all(), required=False @@ -199,15 +206,22 @@ class ConfigContextForm(BootstrapMixin, forms.ModelForm): queryset=Tag.objects.all(), required=False ) - data = JSONField( - label='' + data = JSONField() + + fieldsets = ( + ('Config Context', ('name', 'weight', 'description', 'data', 'is_active')), + ('Assignment', ( + 'regions', 'site_groups', 'sites', 'locations', 'device_types', 'roles', 'platforms', 'cluster_types', + 'cluster_groups', 'clusters', 'tenant_groups', 'tenants', 'tags', + )), ) class Meta: model = ConfigContext fields = ( - 'name', 'weight', 'description', 'is_active', 'regions', 'site_groups', 'sites', 'roles', 'device_types', - 'platforms', 'cluster_types', 'cluster_groups', 'clusters', 'tenant_groups', 'tenants', 'tags', 'data', + 'name', 'weight', 'description', 'data', 'is_active', 'regions', 'site_groups', 'sites', 'locations', + 'roles', 'device_types', 'platforms', 'cluster_types', 'cluster_groups', 'clusters', 'tenant_groups', + 'tenants', 'tags', ) diff --git a/netbox/extras/management/commands/runscript.py b/netbox/extras/management/commands/runscript.py index 12188619f94..2296ce1ffda 100644 --- a/netbox/extras/management/commands/runscript.py +++ b/netbox/extras/management/commands/runscript.py @@ -14,6 +14,7 @@ from extras.choices import JobResultStatusChoices from extras.context_managers import change_logging from extras.models import JobResult from extras.scripts import get_script +from extras.signals import clear_webhooks from utilities.exceptions import AbortTransaction from utilities.utils import NetBoxFakeRequest @@ -49,7 +50,7 @@ class Command(BaseCommand): except AbortTransaction: script.log_info("Database changes have been reverted automatically.") - + clear_webhooks.send(request) except Exception as e: stacktrace = traceback.format_exc() script.log_failure( @@ -58,7 +59,7 @@ class Command(BaseCommand): script.log_info("Database changes have been reverted due to error.") logger.error(f"Exception raised during script execution: {e}") job_result.set_status(JobResultStatusChoices.STATUS_ERRORED) - + clear_webhooks.send(request) finally: job_result.data = ScriptOutputSerializer(script).data job_result.save() diff --git a/netbox/extras/migrations/0074_customfield_group_name.py b/netbox/extras/migrations/0074_customfield_group_name.py new file mode 100644 index 00000000000..e1be76b1fa5 --- /dev/null +++ b/netbox/extras/migrations/0074_customfield_group_name.py @@ -0,0 +1,22 @@ +# Generated by Django 4.0.4 on 2022-04-15 17:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0073_journalentry_tags_custom_fields'), + ] + + operations = [ + migrations.AlterModelOptions( + name='customfield', + options={'ordering': ['group_name', 'weight', 'name']}, + ), + migrations.AddField( + model_name='customfield', + name='group_name', + field=models.CharField(blank=True, max_length=50), + ), + ] diff --git a/netbox/extras/migrations/0075_customfield_ui_visibility.py b/netbox/extras/migrations/0075_customfield_ui_visibility.py new file mode 100644 index 00000000000..29ee65516e0 --- /dev/null +++ b/netbox/extras/migrations/0075_customfield_ui_visibility.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0.4 on 2022-05-23 20:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0074_customfield_group_name'), + ] + + operations = [ + migrations.AddField( + model_name='customfield', + name='ui_visibility', + field=models.CharField(default='read-write', max_length=50), + ), + ] diff --git a/netbox/extras/migrations/0076_configcontext_locations.py b/netbox/extras/migrations/0076_configcontext_locations.py new file mode 100644 index 00000000000..f9b3a664b7a --- /dev/null +++ b/netbox/extras/migrations/0076_configcontext_locations.py @@ -0,0 +1,19 @@ +# Generated by Django 4.0.5 on 2022-06-22 19:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0156_location_status'), + ('extras', '0075_customfield_ui_visibility'), + ] + + operations = [ + migrations.AddField( + model_name='configcontext', + name='locations', + field=models.ManyToManyField(blank=True, related_name='+', to='dcim.location'), + ), + ] diff --git a/netbox/extras/models/configcontexts.py b/netbox/extras/models/configcontexts.py index 0dc5d57dba6..30fb0706946 100644 --- a/netbox/extras/models/configcontexts.py +++ b/netbox/extras/models/configcontexts.py @@ -1,5 +1,3 @@ -from collections import OrderedDict - from django.core.validators import ValidationError from django.db import models from django.urls import reverse @@ -55,6 +53,11 @@ class ConfigContext(WebhooksMixin, ChangeLoggedModel): related_name='+', blank=True ) + locations = models.ManyToManyField( + to='dcim.Location', + related_name='+', + blank=True + ) device_types = models.ManyToManyField( to='dcim.DeviceType', related_name='+', @@ -138,11 +141,10 @@ class ConfigContextModel(models.Model): def get_config_context(self): """ + Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs. Return the rendered configuration context for a device or VM. """ - - # Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs - data = OrderedDict() + data = {} if not hasattr(self, 'config_context_data'): # The annotation is not available, so we fall back to manually querying for the config context objects diff --git a/netbox/extras/models/customfields.py b/netbox/extras/models/customfields.py index 49afe1bbabd..c91f96c15f2 100644 --- a/netbox/extras/models/customfields.py +++ b/netbox/extras/models/customfields.py @@ -79,6 +79,11 @@ class CustomField(ExportTemplatesMixin, WebhooksMixin, ChangeLoggedModel): help_text='Name of the field as displayed to users (if not provided, ' 'the field\'s name will be used)' ) + group_name = models.CharField( + max_length=50, + blank=True, + help_text="Custom fields within the same group will be displayed together" + ) description = models.CharField( max_length=200, blank=True @@ -131,10 +136,17 @@ class CustomField(ExportTemplatesMixin, WebhooksMixin, ChangeLoggedModel): null=True, help_text='Comma-separated list of available choices (for selection fields)' ) + ui_visibility = models.CharField( + max_length=50, + choices=CustomFieldVisibilityChoices, + default=CustomFieldVisibilityChoices.VISIBILITY_READ_WRITE, + verbose_name='UI visibility', + help_text='Specifies the visibility of custom field in the UI' + ) objects = CustomFieldManager() class Meta: - ordering = ['weight', 'name'] + ordering = ['group_name', 'weight', 'name'] def __str__(self): return self.label or self.name.replace('_', ' ').capitalize() diff --git a/netbox/extras/querysets.py b/netbox/extras/querysets.py index 21727d3d480..2b97af0fbf1 100644 --- a/netbox/extras/querysets.py +++ b/netbox/extras/querysets.py @@ -19,8 +19,9 @@ class ConfigContextQuerySet(RestrictedQuerySet): # `device_role` for Device; `role` for VirtualMachine role = getattr(obj, 'device_role', None) or obj.role - # Device type assignment is relevant only for Devices + # Device type and location assignment is relevant only for Devices device_type = getattr(obj, 'device_type', None) + location = getattr(obj, 'location', None) # Get assigned cluster, group, and type (if any) cluster = getattr(obj, 'cluster', None) @@ -42,6 +43,7 @@ class ConfigContextQuerySet(RestrictedQuerySet): Q(regions__in=regions) | Q(regions=None), Q(site_groups__in=sitegroups) | Q(site_groups=None), Q(sites=obj.site) | Q(sites=None), + Q(locations=location) | Q(locations=None), Q(device_types=device_type) | Q(device_types=None), Q(roles=role) | Q(roles=None), Q(platforms=obj.platform) | Q(platforms=None), @@ -114,6 +116,7 @@ class ConfigContextModelQuerySet(RestrictedQuerySet): ) if self.model._meta.model_name == 'device': + base_query.add((Q(locations=OuterRef('location')) | Q(locations=None)), Q.AND) base_query.add((Q(device_types=OuterRef('device_type')) | Q(device_types=None)), Q.AND) base_query.add((Q(roles=OuterRef('device_role')) | Q(roles=None)), Q.AND) base_query.add((Q(sites=OuterRef('site')) | Q(sites=None)), Q.AND) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index 4332d72f70c..cee264878a0 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -17,6 +17,7 @@ from django.utils.functional import classproperty from extras.api.serializers import ScriptOutputSerializer from extras.choices import JobResultStatusChoices, LogLevelChoices +from extras.signals import clear_webhooks from ipam.formfields import IPAddressFormField, IPNetworkFormField from ipam.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator, prefix_validator from utilities.exceptions import AbortTransaction @@ -306,9 +307,16 @@ class BaseScript: @classmethod def _get_vars(cls): vars = {} - for name, attr in cls.__dict__.items(): - if name not in vars and issubclass(attr.__class__, ScriptVariable): - vars[name] = attr + + # Iterate all base classes looking for ScriptVariables + for base_class in inspect.getmro(cls): + # When object is reached there's no reason to continue + if base_class is object: + break + + for name, attr in base_class.__dict__.items(): + if name not in vars and issubclass(attr.__class__, ScriptVariable): + vars[name] = attr # Order variables according to field_order field_order = getattr(cls.Meta, 'field_order', None) @@ -458,7 +466,7 @@ def run_script(data, request, commit=True, *args, **kwargs): except AbortTransaction: script.log_info("Database changes have been reverted automatically.") - + clear_webhooks.send(request) except Exception as e: stacktrace = traceback.format_exc() script.log_failure( @@ -467,7 +475,7 @@ def run_script(data, request, commit=True, *args, **kwargs): script.log_info("Database changes have been reverted due to error.") logger.error(f"Exception raised during script execution: {e}") job_result.set_status(JobResultStatusChoices.STATUS_ERRORED) - + clear_webhooks.send(request) finally: job_result.data = ScriptOutputSerializer(script).data job_result.save() diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index a13054d56f7..2fa13f98a06 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -28,14 +28,15 @@ class CustomFieldTable(NetBoxTable): ) content_types = columns.ContentTypesColumn() required = columns.BooleanColumn() + ui_visibility = columns.ChoiceFieldColumn(verbose_name="UI visibility") class Meta(NetBoxTable.Meta): model = CustomField fields = ( - 'pk', 'id', 'name', 'content_types', 'label', 'type', 'required', 'weight', 'default', - 'description', 'filter_logic', 'choices', 'created', 'last_updated', + 'pk', 'id', 'name', 'content_types', 'label', 'type', 'group_name', 'required', 'weight', 'default', + 'description', 'filter_logic', 'ui_visibility', 'choices', 'created', 'last_updated', ) - default_columns = ('pk', 'name', 'content_types', 'label', 'type', 'required', 'description') + default_columns = ('pk', 'name', 'content_types', 'label', 'group_name', 'type', 'required', 'description') # @@ -166,8 +167,9 @@ class ConfigContextTable(NetBoxTable): class Meta(NetBoxTable.Meta): model = ConfigContext fields = ( - 'pk', 'id', 'name', 'weight', 'is_active', 'description', 'regions', 'sites', 'roles', 'platforms', - 'cluster_types', 'cluster_groups', 'clusters', 'tenant_groups', 'tenants', 'created', 'last_updated', + 'pk', 'id', 'name', 'weight', 'is_active', 'description', 'regions', 'sites', 'locations', 'roles', + 'platforms', 'cluster_types', 'cluster_groups', 'clusters', 'tenant_groups', 'tenants', 'created', + 'last_updated', ) default_columns = ('pk', 'name', 'weight', 'is_active', 'description') diff --git a/netbox/extras/tests/test_filtersets.py b/netbox/extras/tests/test_filtersets.py index bdb8de9dbb8..a88ed9418b2 100644 --- a/netbox/extras/tests/test_filtersets.py +++ b/netbox/extras/tests/test_filtersets.py @@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType from django.test import TestCase from circuits.models import Provider -from dcim.models import DeviceRole, DeviceType, Manufacturer, Platform, Rack, Region, Site, SiteGroup +from dcim.models import DeviceRole, DeviceType, Location, Manufacturer, Platform, Rack, Region, Site, SiteGroup from extras.choices import JournalEntryKindChoices, ObjectChangeActionChoices from extras.filtersets import * from extras.models import * @@ -368,9 +368,9 @@ class ConfigContextTestCase(TestCase, ChangeLoggedFilterSetTests): def setUpTestData(cls): regions = ( - Region(name='Test Region 1', slug='test-region-1'), - Region(name='Test Region 2', slug='test-region-2'), - Region(name='Test Region 3', slug='test-region-3'), + Region(name='Region 1', slug='region-1'), + Region(name='Region 2', slug='region-2'), + Region(name='Region 3', slug='region-3'), ) for r in regions: r.save() @@ -384,12 +384,20 @@ class ConfigContextTestCase(TestCase, ChangeLoggedFilterSetTests): site_group.save() sites = ( - Site(name='Test Site 1', slug='test-site-1'), - Site(name='Test Site 2', slug='test-site-2'), - Site(name='Test Site 3', slug='test-site-3'), + Site(name='Site 1', slug='site-1'), + Site(name='Site 2', slug='site-2'), + Site(name='Site 3', slug='site-3'), ) Site.objects.bulk_create(sites) + locations = ( + Location(name='Location 1', slug='location-1', site=sites[0]), + Location(name='Location 2', slug='location-2', site=sites[1]), + Location(name='Location 3', slug='location-3', site=sites[2]), + ) + for location in locations: + location.save() + manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1') device_types = ( DeviceType(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1'), @@ -460,6 +468,7 @@ class ConfigContextTestCase(TestCase, ChangeLoggedFilterSetTests): c.regions.set([regions[i]]) c.site_groups.set([site_groups[i]]) c.sites.set([sites[i]]) + c.locations.set([locations[i]]) c.device_types.set([device_types[i]]) c.roles.set([device_roles[i]]) c.platforms.set([platforms[i]]) @@ -501,6 +510,13 @@ class ConfigContextTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'site': [sites[0].slug, sites[1].slug]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_location(self): + locations = Location.objects.all()[:2] + params = {'location_id': [locations[0].pk, locations[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'location': [locations[0].slug, locations[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_device_type(self): device_types = DeviceType.objects.all()[:2] params = {'device_type_id': [device_types[0].pk, device_types[1].pk]} diff --git a/netbox/extras/tests/test_models.py b/netbox/extras/tests/test_models.py index 17138d42b4d..4929690e785 100644 --- a/netbox/extras/tests/test_models.py +++ b/netbox/extras/tests/test_models.py @@ -1,6 +1,6 @@ from django.test import TestCase -from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Platform, Region, Site, SiteGroup +from dcim.models import Device, DeviceRole, DeviceType, Location, Manufacturer, Platform, Region, Site, SiteGroup from extras.models import ConfigContext, Tag from tenancy.models import Tenant, TenantGroup from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine @@ -29,7 +29,8 @@ class ConfigContextTest(TestCase): self.devicerole = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1') self.region = Region.objects.create(name="Region") self.sitegroup = SiteGroup.objects.create(name="Site Group") - self.site = Site.objects.create(name='Site-1', slug='site-1', region=self.region, group=self.sitegroup) + self.site = Site.objects.create(name='Site 1', slug='site-1', region=self.region, group=self.sitegroup) + self.location = Location.objects.create(name='Location 1', slug='location-1', site=self.site) self.platform = Platform.objects.create(name="Platform") self.tenantgroup = TenantGroup.objects.create(name="Tenant Group") self.tenant = Tenant.objects.create(name="Tenant", group=self.tenantgroup) @@ -40,7 +41,8 @@ class ConfigContextTest(TestCase): name='Device 1', device_type=self.devicetype, device_role=self.devicerole, - site=self.site + site=self.site, + location=self.location ) def test_higher_weight_wins(self): @@ -144,15 +146,6 @@ class ConfigContextTest(TestCase): self.assertEqual(self.device.get_config_context(), annotated_queryset[0].get_config_context()) def test_annotation_same_as_get_for_object_device_relations(self): - - site_context = ConfigContext.objects.create( - name="site", - weight=100, - data={ - "site": 1 - } - ) - site_context.sites.add(self.site) region_context = ConfigContext.objects.create( name="region", weight=100, @@ -169,6 +162,22 @@ class ConfigContextTest(TestCase): } ) sitegroup_context.site_groups.add(self.sitegroup) + site_context = ConfigContext.objects.create( + name="site", + weight=100, + data={ + "site": 1 + } + ) + site_context.sites.add(self.site) + location_context = ConfigContext.objects.create( + name="location", + weight=100, + data={ + "location": 1 + } + ) + location_context.locations.add(self.location) platform_context = ConfigContext.objects.create( name="platform", weight=100, @@ -205,6 +214,7 @@ class ConfigContextTest(TestCase): device = Device.objects.create( name="Device 2", site=self.site, + location=self.location, tenant=self.tenant, platform=self.platform, device_role=self.devicerole, @@ -220,13 +230,6 @@ class ConfigContextTest(TestCase): cluster_group = ClusterGroup.objects.create(name="Cluster Group") cluster = Cluster.objects.create(name="Cluster", group=cluster_group, type=cluster_type) - site_context = ConfigContext.objects.create( - name="site", - weight=100, - data={"site": 1} - ) - site_context.sites.add(self.site) - region_context = ConfigContext.objects.create( name="region", weight=100, @@ -241,6 +244,13 @@ class ConfigContextTest(TestCase): ) sitegroup_context.site_groups.add(self.sitegroup) + site_context = ConfigContext.objects.create( + name="site", + weight=100, + data={"site": 1} + ) + site_context.sites.add(self.site) + platform_context = ConfigContext.objects.create( name="platform", weight=100, diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py index ea3a952d61b..936213cbf00 100644 --- a/netbox/extras/tests/test_views.py +++ b/netbox/extras/tests/test_views.py @@ -36,13 +36,15 @@ class CustomFieldTestCase(ViewTestCases.PrimaryObjectViewTestCase): 'default': None, 'weight': 200, 'required': True, + 'ui_visibility': CustomFieldVisibilityChoices.VISIBILITY_READ_WRITE, } cls.csv_data = ( - 'name,label,type,content_types,weight,filter_logic,choices,validation_minimum,validation_maximum,validation_regex', - 'field4,Field 4,text,dcim.site,100,exact,,,,[a-z]{3}', - 'field5,Field 5,integer,dcim.site,100,exact,,1,100,', - 'field6,Field 6,select,dcim.site,100,exact,"A,B,C",,,', + 'name,label,type,content_types,object_type,weight,filter_logic,choices,validation_minimum,validation_maximum,validation_regex,ui_visibility', + 'field4,Field 4,text,dcim.site,,100,exact,,,,[a-z]{3},read-write', + 'field5,Field 5,integer,dcim.site,,100,exact,,1,100,,read-write', + 'field6,Field 6,select,dcim.site,,100,exact,"A,B,C",,,,read-write', + 'field7,Field 7,object,dcim.site,dcim.region,100,exact,,,,,read-write', ) cls.bulk_edit_data = { diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 9825d10def1..bb99536c3c4 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -281,6 +281,7 @@ class ConfigContextView(generic.ObjectView): ('Regions', instance.regions.all), ('Site Groups', instance.site_groups.all), ('Sites', instance.sites.all), + ('Locations', instance.locations.all), ('Device Types', instance.device_types.all), ('Roles', instance.roles.all), ('Platforms', instance.platforms.all), @@ -311,7 +312,6 @@ class ConfigContextView(generic.ObjectView): class ConfigContextEditView(generic.ObjectEditView): queryset = ConfigContext.objects.all() form = forms.ConfigContextForm - template_name = 'extras/configcontext_edit.html' class ConfigContextBulkEditView(generic.BulkEditView): diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index 3fa1bcc7e35..ea5c37f9169 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -360,7 +360,7 @@ class IPAddressSerializer(NetBoxModelSerializer): ) assigned_object = serializers.SerializerMethodField(read_only=True) nat_inside = NestedIPAddressSerializer(required=False, allow_null=True) - nat_outside = NestedIPAddressSerializer(required=False, read_only=True) + nat_outside = NestedIPAddressSerializer(many=True, read_only=True) class Meta: model = IPAddress @@ -369,7 +369,6 @@ class IPAddressSerializer(NetBoxModelSerializer): 'assigned_object_id', 'assigned_object', 'nat_inside', 'nat_outside', 'dns_name', 'description', 'tags', 'custom_fields', 'created', 'last_updated', ] - read_only_fields = ['family', 'nat_outside'] @swagger_serializer_method(serializer_or_field=serializers.DictField) def get_assigned_object(self, obj): diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 7839dc03ec7..d9cf6eefc7f 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -145,9 +145,11 @@ class AggregateFilterSet(NetBoxModelFilterSet, TenancyFilterSet): if not value.strip(): return queryset qs_filter = Q(description__icontains=value) + qs_filter |= Q(prefix__contains=value.strip()) try: prefix = str(netaddr.IPNetwork(value.strip()).cidr) qs_filter |= Q(prefix__net_contains_or_equals=prefix) + qs_filter |= Q(prefix__contains=value.strip()) except (AddrFormatError, ValueError): pass return queryset.filter(qs_filter) @@ -334,9 +336,11 @@ class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet): if not value.strip(): return queryset qs_filter = Q(description__icontains=value) + qs_filter |= Q(prefix__contains=value.strip()) try: prefix = str(netaddr.IPNetwork(value.strip()).cidr) qs_filter |= Q(prefix__net_contains_or_equals=prefix) + qs_filter |= Q(prefix__contains=value.strip()) except (AddrFormatError, ValueError): pass return queryset.filter(qs_filter) @@ -460,7 +464,7 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet): field_name='address', lookup_expr='family' ) - parent = django_filters.CharFilter( + parent = MultiValueCharFilter( method='search_by_parent', label='Parent prefix', ) @@ -567,14 +571,16 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet): return queryset.filter(qs_filter) def search_by_parent(self, queryset, name, value): - value = value.strip() if not value: return queryset - try: - query = str(netaddr.IPNetwork(value.strip()).cidr) - return queryset.filter(address__net_host_contained=query) - except (AddrFormatError, ValueError): - return queryset.none() + q = Q() + for prefix in value: + try: + query = str(netaddr.IPNetwork(prefix.strip()).cidr) + q |= Q(address__net_host_contained=query) + except (AddrFormatError, ValueError): + return queryset.none() + return queryset.filter(q) def filter_address(self, queryset, name, value): try: diff --git a/netbox/ipam/migrations/0058_ipaddress_nat_inside_nonunique.py b/netbox/ipam/migrations/0058_ipaddress_nat_inside_nonunique.py new file mode 100644 index 00000000000..63e93d13709 --- /dev/null +++ b/netbox/ipam/migrations/0058_ipaddress_nat_inside_nonunique.py @@ -0,0 +1,17 @@ +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0057_created_datetimefield'), + ] + + operations = [ + migrations.AlterField( + model_name='ipaddress', + name='nat_inside', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='nat_outside', to='ipam.ipaddress'), + ), + ] diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index a3b8fb2c147..db662f49c60 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -813,7 +813,7 @@ class IPAddress(NetBoxModel): ct_field='assigned_object_type', fk_field='assigned_object_id' ) - nat_inside = models.OneToOneField( + nat_inside = models.ForeignKey( to='self', on_delete=models.SET_NULL, related_name='nat_outside', diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index 475ad787e6e..558631585cb 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -226,8 +226,9 @@ class PrefixUtilizationColumn(columns.UtilizationColumn): class PrefixTable(NetBoxTable): - prefix = tables.TemplateColumn( + prefix = columns.TemplateColumn( template_code=PREFIX_LINK, + export_raw=True, attrs={'td': {'class': 'text-nowrap'}} ) prefix_flat = tables.TemplateColumn( diff --git a/netbox/ipam/tables/services.py b/netbox/ipam/tables/services.py index 8c81a28c29b..58d0a9aff2b 100644 --- a/netbox/ipam/tables/services.py +++ b/netbox/ipam/tables/services.py @@ -14,7 +14,8 @@ class ServiceTemplateTable(NetBoxTable): linkify=True ) ports = tables.Column( - accessor=tables.A('port_list') + accessor=tables.A('port_list'), + order_by=tables.A('ports'), ) tags = columns.TagColumn( url_name='ipam:servicetemplate_list' @@ -35,7 +36,8 @@ class ServiceTable(NetBoxTable): order_by=('device', 'virtual_machine') ) ports = tables.Column( - accessor=tables.A('port_list') + accessor=tables.A('port_list'), + order_by=tables.A('ports'), ) tags = columns.TagColumn( url_name='ipam:service_list' diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index 198f9d62d71..d98fe889e51 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -823,10 +823,8 @@ class IPAddressTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_parent(self): - params = {'parent': '10.0.0.0/24'} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 6) - params = {'parent': '2001:db8::/64'} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 6) + params = {'parent': ['10.0.0.0/30', '2001:db8::/126']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 8) def test_filter_address(self): # Check IPv4 and IPv6, with and without a mask diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 79804aabd5d..6682fc920e4 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -4,15 +4,15 @@ from django.db.models.expressions import RawSQL from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse -from circuits.models import Provider +from circuits.models import Provider, Circuit from circuits.tables import ProviderTable from dcim.filtersets import InterfaceFilterSet -from dcim.models import Interface, Site +from dcim.models import Interface, Site, Device from dcim.tables import SiteTable from netbox.views import generic from utilities.utils import count_related from virtualization.filtersets import VMInterfaceFilterSet -from virtualization.models import VMInterface +from virtualization.models import VMInterface, VirtualMachine from . import filtersets, forms, tables from .constants import * from .models import * @@ -225,7 +225,9 @@ class ASNView(generic.ObjectView): sites_table.configure(request) # Gather assigned Providers - providers = instance.providers.restrict(request.user, 'view') + providers = instance.providers.restrict(request.user, 'view').annotate( + count_circuits=count_related(Circuit, 'provider') + ) providers_table = ProviderTable(providers, user=request.user) providers_table.configure(request) @@ -585,7 +587,7 @@ class IPRangeIPAddressesView(generic.ObjectChildrenView): def get_children(self, request, parent): return parent.get_child_ips().restrict(request.user, 'view').prefetch_related( - 'vrf', 'role', 'tenant', + 'vrf', 'tenant', ) def get_extra_context(self, request, instance): @@ -674,11 +676,26 @@ class IPAddressView(generic.ObjectView): related_ips_table = tables.IPAddressTable(related_ips, orderable=False) related_ips_table.configure(request) + # Find services belonging to the IP + service_filter = Q(ipaddresses=instance) + + # Find services listening on all IPs on the assigned device/vm + if instance.assigned_object and instance.assigned_object.parent_object: + parent_object = instance.assigned_object.parent_object + + if isinstance(parent_object, VirtualMachine): + service_filter |= (Q(virtual_machine=parent_object) & Q(ipaddresses=None)) + elif isinstance(parent_object, Device): + service_filter |= (Q(device=parent_object) & Q(ipaddresses=None)) + + services = Service.objects.restrict(request.user, 'view').filter(service_filter) + return { 'parent_prefixes_table': parent_prefixes_table, 'duplicate_ips_table': duplicate_ips_table, 'more_duplicate_ips': duplicate_ips.count() > 10, 'related_ips_table': related_ips_table, + 'services': services, } diff --git a/netbox/netbox/api/__init__.py b/netbox/netbox/api/__init__.py index 1eaa7d1c42f..231ab55e6ab 100644 --- a/netbox/netbox/api/__init__.py +++ b/netbox/netbox/api/__init__.py @@ -1,4 +1,4 @@ -from .fields import ChoiceField, ContentTypeField, SerializedPKRelatedField +from .fields import * from .routers import NetBoxRouter from .serializers import BulkOperationSerializer, ValidatedModelSerializer, WritableNestedSerializer @@ -7,6 +7,7 @@ __all__ = ( 'BulkOperationSerializer', 'ChoiceField', 'ContentTypeField', + 'IPNetworkSerializer', 'NetBoxRouter', 'SerializedPKRelatedField', 'ValidatedModelSerializer', diff --git a/netbox/netbox/api/authentication.py b/netbox/netbox/api/authentication.py index 847bcbfd9f2..1b7def3a3ed 100644 --- a/netbox/netbox/api/authentication.py +++ b/netbox/netbox/api/authentication.py @@ -7,14 +7,36 @@ from rest_framework.permissions import BasePermission, DjangoObjectPermissions, from netbox.config import get_config from users.models import Token +from utilities.request import get_client_ip class TokenAuthentication(authentication.TokenAuthentication): """ - A custom authentication scheme which enforces Token expiration times. + A custom authentication scheme which enforces Token expiration times and source IP restrictions. """ model = Token + def authenticate(self, request): + result = super().authenticate(request) + + if result: + token = result[1] + + # Enforce source IP restrictions (if any) set on the token + if token.allowed_ips: + client_ip = get_client_ip(request) + if client_ip is None: + raise exceptions.AuthenticationFailed( + "Client IP address could not be determined for validation. Check that the HTTP server is " + "correctly configured to pass the required header(s)." + ) + if not token.validate_client_ip(client_ip): + raise exceptions.AuthenticationFailed( + f"Source IP {client_ip} is not permitted to authenticate using this token." + ) + + return result + def authenticate_credentials(self, key): model = self.get_model() try: diff --git a/netbox/netbox/api/fields.py b/netbox/netbox/api/fields.py index d73cbcac247..1f3c40dc23c 100644 --- a/netbox/netbox/api/fields.py +++ b/netbox/netbox/api/fields.py @@ -1,12 +1,18 @@ from collections import OrderedDict -import pytz -from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist +from netaddr import IPNetwork from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.relations import PrimaryKeyRelatedField, RelatedField +__all__ = ( + 'ChoiceField', + 'ContentTypeField', + 'IPNetworkSerializer', + 'SerializedPKRelatedField', +) + class ChoiceField(serializers.Field): """ @@ -104,6 +110,17 @@ class ContentTypeField(RelatedField): return f"{obj.app_label}.{obj.model}" +class IPNetworkSerializer(serializers.Serializer): + """ + Representation of an IP network value (e.g. 192.0.2.0/24). + """ + def to_representation(self, instance): + return str(instance) + + def to_internal_value(self, value): + return IPNetwork(value) + + class SerializedPKRelatedField(PrimaryKeyRelatedField): """ Extends PrimaryKeyRelatedField to return a serialized object on read. This is useful for representing related diff --git a/netbox/netbox/api/pagination.py b/netbox/netbox/api/pagination.py index d89e321245e..5ecade26402 100644 --- a/netbox/netbox/api/pagination.py +++ b/netbox/netbox/api/pagination.py @@ -16,7 +16,7 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination): def paginate_queryset(self, queryset, request, view=None): if isinstance(queryset, QuerySet): - self.count = queryset.count() + self.count = self.get_queryset_count(queryset) else: # We're dealing with an iterable, not a QuerySet self.count = len(queryset) @@ -52,6 +52,9 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination): return self.default_limit + def get_queryset_count(self, queryset): + return queryset.count() + def get_next_link(self): # Pagination has been disabled @@ -67,3 +70,16 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination): return None return super().get_previous_link() + + +class StripCountAnnotationsPaginator(OptionalLimitOffsetPagination): + """ + Strips the annotations on the queryset before getting the count + to optimize pagination of complex queries. + """ + def get_queryset_count(self, queryset): + # Clone the queryset to avoid messing up the actual query + cloned_queryset = queryset.all() + cloned_queryset.query.annotations.clear() + + return cloned_queryset.count() diff --git a/netbox/netbox/configuration_example.py b/netbox/netbox/configuration_example.py index c82749e3f53..ad0dcc7c311 100644 --- a/netbox/netbox/configuration_example.py +++ b/netbox/netbox/configuration_example.py @@ -202,6 +202,9 @@ RQ_DEFAULT_TIMEOUT = 300 # this setting is derived from the installed location. # SCRIPTS_ROOT = '/opt/netbox/netbox/scripts' +# The name to use for the csrf token cookie. +CSRF_COOKIE_NAME = 'csrftoken' + # The name to use for the session cookie. SESSION_COOKIE_NAME = 'sessionid' diff --git a/netbox/netbox/configuration_testing.py b/netbox/netbox/configuration_testing.py index 59529b80c48..621671f0411 100644 --- a/netbox/netbox/configuration_testing.py +++ b/netbox/netbox/configuration_testing.py @@ -36,3 +36,8 @@ REDIS = { } SECRET_KEY = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' + +LOGGING = { + 'version': 1, + 'disable_existing_loggers': True +} diff --git a/netbox/netbox/constants.py b/netbox/netbox/constants.py index e054dc9da2f..8ca0d98c1f9 100644 --- a/netbox/netbox/constants.py +++ b/netbox/netbox/constants.py @@ -1,32 +1,24 @@ from collections import OrderedDict from typing import Dict -from circuits.filtersets import CircuitFilterSet, ProviderFilterSet, ProviderNetworkFilterSet +import circuits.filtersets +import circuits.tables +import dcim.filtersets +import dcim.tables +import ipam.filtersets +import ipam.tables +import tenancy.filtersets +import tenancy.tables +import virtualization.filtersets +import virtualization.tables from circuits.models import Circuit, ProviderNetwork, Provider -from circuits.tables import CircuitTable, ProviderNetworkTable, ProviderTable -from dcim.filtersets import ( - CableFilterSet, DeviceFilterSet, DeviceTypeFilterSet, LocationFilterSet, ModuleFilterSet, ModuleTypeFilterSet, - PowerFeedFilterSet, RackFilterSet, RackReservationFilterSet, SiteFilterSet, VirtualChassisFilterSet, -) from dcim.models import ( Cable, Device, DeviceType, Location, Module, ModuleType, PowerFeed, Rack, RackReservation, Site, VirtualChassis, ) -from dcim.tables import ( - CableTable, DeviceTable, DeviceTypeTable, LocationTable, ModuleTable, ModuleTypeTable, PowerFeedTable, RackTable, - RackReservationTable, SiteTable, VirtualChassisTable, -) -from ipam.filtersets import ( - AggregateFilterSet, ASNFilterSet, IPAddressFilterSet, PrefixFilterSet, VLANFilterSet, VRFFilterSet, -) -from ipam.models import Aggregate, ASN, IPAddress, Prefix, VLAN, VRF -from ipam.tables import AggregateTable, ASNTable, IPAddressTable, PrefixTable, VLANTable, VRFTable -from tenancy.filtersets import ContactFilterSet, TenantFilterSet +from ipam.models import Aggregate, ASN, IPAddress, Prefix, Service, VLAN, VRF from tenancy.models import Contact, Tenant, ContactAssignment -from tenancy.tables import ContactTable, TenantTable from utilities.utils import count_related -from virtualization.filtersets import ClusterFilterSet, VirtualMachineFilterSet from virtualization.models import Cluster, VirtualMachine -from virtualization.tables import ClusterTable, VirtualMachineTable SEARCH_MAX_RESULTS = 15 @@ -36,22 +28,22 @@ CIRCUIT_TYPES = OrderedDict( 'queryset': Provider.objects.annotate( count_circuits=count_related(Circuit, 'provider') ), - 'filterset': ProviderFilterSet, - 'table': ProviderTable, + 'filterset': circuits.filtersets.ProviderFilterSet, + 'table': circuits.tables.ProviderTable, 'url': 'circuits:provider_list', }), ('circuit', { 'queryset': Circuit.objects.prefetch_related( 'type', 'provider', 'tenant', 'terminations__site' ), - 'filterset': CircuitFilterSet, - 'table': CircuitTable, + 'filterset': circuits.filtersets.CircuitFilterSet, + 'table': circuits.tables.CircuitTable, 'url': 'circuits:circuit_list', }), ('providernetwork', { 'queryset': ProviderNetwork.objects.prefetch_related('provider'), - 'filterset': ProviderNetworkFilterSet, - 'table': ProviderNetworkTable, + 'filterset': circuits.filtersets.ProviderNetworkFilterSet, + 'table': circuits.tables.ProviderNetworkTable, 'url': 'circuits:providernetwork_list', }), ) @@ -62,22 +54,22 @@ DCIM_TYPES = OrderedDict( ( ('site', { 'queryset': Site.objects.prefetch_related('region', 'tenant'), - 'filterset': SiteFilterSet, - 'table': SiteTable, + 'filterset': dcim.filtersets.SiteFilterSet, + 'table': dcim.tables.SiteTable, 'url': 'dcim:site_list', }), ('rack', { 'queryset': Rack.objects.prefetch_related('site', 'location', 'tenant', 'role').annotate( device_count=count_related(Device, 'rack') ), - 'filterset': RackFilterSet, - 'table': RackTable, + 'filterset': dcim.filtersets.RackFilterSet, + 'table': dcim.tables.RackTable, 'url': 'dcim:rack_list', }), ('rackreservation', { 'queryset': RackReservation.objects.prefetch_related('site', 'rack', 'user'), - 'filterset': RackReservationFilterSet, - 'table': RackReservationTable, + 'filterset': dcim.filtersets.RackReservationFilterSet, + 'table': dcim.tables.RackReservationTable, 'url': 'dcim:rackreservation_list', }), ('location', { @@ -94,60 +86,60 @@ DCIM_TYPES = OrderedDict( 'rack_count', cumulative=True ).prefetch_related('site'), - 'filterset': LocationFilterSet, - 'table': LocationTable, + 'filterset': dcim.filtersets.LocationFilterSet, + 'table': dcim.tables.LocationTable, 'url': 'dcim:location_list', }), ('devicetype', { 'queryset': DeviceType.objects.prefetch_related('manufacturer').annotate( instance_count=count_related(Device, 'device_type') ), - 'filterset': DeviceTypeFilterSet, - 'table': DeviceTypeTable, + 'filterset': dcim.filtersets.DeviceTypeFilterSet, + 'table': dcim.tables.DeviceTypeTable, 'url': 'dcim:devicetype_list', }), ('device', { 'queryset': Device.objects.prefetch_related( 'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6', ), - 'filterset': DeviceFilterSet, - 'table': DeviceTable, + 'filterset': dcim.filtersets.DeviceFilterSet, + 'table': dcim.tables.DeviceTable, 'url': 'dcim:device_list', }), ('moduletype', { 'queryset': ModuleType.objects.prefetch_related('manufacturer').annotate( instance_count=count_related(Module, 'module_type') ), - 'filterset': ModuleTypeFilterSet, - 'table': ModuleTypeTable, + 'filterset': dcim.filtersets.ModuleTypeFilterSet, + 'table': dcim.tables.ModuleTypeTable, 'url': 'dcim:moduletype_list', }), ('module', { 'queryset': Module.objects.prefetch_related( 'module_type__manufacturer', 'device', 'module_bay', ), - 'filterset': ModuleFilterSet, - 'table': ModuleTable, + 'filterset': dcim.filtersets.ModuleFilterSet, + 'table': dcim.tables.ModuleTable, 'url': 'dcim:module_list', }), ('virtualchassis', { 'queryset': VirtualChassis.objects.prefetch_related('master').annotate( member_count=count_related(Device, 'virtual_chassis') ), - 'filterset': VirtualChassisFilterSet, - 'table': VirtualChassisTable, + 'filterset': dcim.filtersets.VirtualChassisFilterSet, + 'table': dcim.tables.VirtualChassisTable, 'url': 'dcim:virtualchassis_list', }), ('cable', { 'queryset': Cable.objects.all(), - 'filterset': CableFilterSet, - 'table': CableTable, + 'filterset': dcim.filtersets.CableFilterSet, + 'table': dcim.tables.CableTable, 'url': 'dcim:cable_list', }), ('powerfeed', { 'queryset': PowerFeed.objects.all(), - 'filterset': PowerFeedFilterSet, - 'table': PowerFeedTable, + 'filterset': dcim.filtersets.PowerFeedFilterSet, + 'table': dcim.tables.PowerFeedTable, 'url': 'dcim:powerfeed_list', }), ) @@ -157,40 +149,46 @@ IPAM_TYPES = OrderedDict( ( ('vrf', { 'queryset': VRF.objects.prefetch_related('tenant'), - 'filterset': VRFFilterSet, - 'table': VRFTable, + 'filterset': ipam.filtersets.VRFFilterSet, + 'table': ipam.tables.VRFTable, 'url': 'ipam:vrf_list', }), ('aggregate', { 'queryset': Aggregate.objects.prefetch_related('rir'), - 'filterset': AggregateFilterSet, - 'table': AggregateTable, + 'filterset': ipam.filtersets.AggregateFilterSet, + 'table': ipam.tables.AggregateTable, 'url': 'ipam:aggregate_list', }), ('prefix', { 'queryset': Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role'), - 'filterset': PrefixFilterSet, - 'table': PrefixTable, + 'filterset': ipam.filtersets.PrefixFilterSet, + 'table': ipam.tables.PrefixTable, 'url': 'ipam:prefix_list', }), ('ipaddress', { 'queryset': IPAddress.objects.prefetch_related('vrf__tenant', 'tenant'), - 'filterset': IPAddressFilterSet, - 'table': IPAddressTable, + 'filterset': ipam.filtersets.IPAddressFilterSet, + 'table': ipam.tables.IPAddressTable, 'url': 'ipam:ipaddress_list', }), ('vlan', { 'queryset': VLAN.objects.prefetch_related('site', 'group', 'tenant', 'role'), - 'filterset': VLANFilterSet, - 'table': VLANTable, + 'filterset': ipam.filtersets.VLANFilterSet, + 'table': ipam.tables.VLANTable, 'url': 'ipam:vlan_list', }), ('asn', { 'queryset': ASN.objects.prefetch_related('rir', 'tenant'), - 'filterset': ASNFilterSet, - 'table': ASNTable, + 'filterset': ipam.filtersets.ASNFilterSet, + 'table': ipam.tables.ASNTable, 'url': 'ipam:asn_list', }), + ('service', { + 'queryset': Service.objects.prefetch_related('device', 'virtual_machine'), + 'filterset': ipam.filtersets.ServiceFilterSet, + 'table': ipam.tables.ServiceTable, + 'url': 'ipam:service_list', + }), ) ) @@ -198,15 +196,15 @@ TENANCY_TYPES = OrderedDict( ( ('tenant', { 'queryset': Tenant.objects.prefetch_related('group'), - 'filterset': TenantFilterSet, - 'table': TenantTable, + 'filterset': tenancy.filtersets.TenantFilterSet, + 'table': tenancy.tables.TenantTable, 'url': 'tenancy:tenant_list', }), ('contact', { 'queryset': Contact.objects.prefetch_related('group', 'assignments').annotate( assignment_count=count_related(ContactAssignment, 'contact')), - 'filterset': ContactFilterSet, - 'table': ContactTable, + 'filterset': tenancy.filtersets.ContactFilterSet, + 'table': tenancy.tables.ContactTable, 'url': 'tenancy:contact_list', }), ) @@ -219,16 +217,16 @@ VIRTUALIZATION_TYPES = OrderedDict( device_count=count_related(Device, 'cluster'), vm_count=count_related(VirtualMachine, 'cluster') ), - 'filterset': ClusterFilterSet, - 'table': ClusterTable, + 'filterset': virtualization.filtersets.ClusterFilterSet, + 'table': virtualization.tables.ClusterTable, 'url': 'virtualization:cluster_list', }), ('virtualmachine', { 'queryset': VirtualMachine.objects.prefetch_related( 'cluster', 'tenant', 'platform', 'primary_ip4', 'primary_ip6', ), - 'filterset': VirtualMachineFilterSet, - 'table': VirtualMachineTable, + 'filterset': virtualization.filtersets.VirtualMachineFilterSet, + 'table': virtualization.tables.VirtualMachineTable, 'url': 'virtualization:virtualmachine_list', }), ) diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py index e443dde5f73..817da526ba1 100644 --- a/netbox/netbox/models/features.py +++ b/netbox/netbox/models/features.py @@ -1,3 +1,5 @@ +from collections import defaultdict + from django.contrib.contenttypes.fields import GenericRelation from django.db.models.signals import class_prepared from django.dispatch import receiver @@ -7,7 +9,7 @@ from django.core.validators import ValidationError from django.db import models from taggit.managers import TaggableManager -from extras.choices import ObjectChangeActionChoices +from extras.choices import CustomFieldVisibilityChoices, ObjectChangeActionChoices from extras.utils import register_features from netbox.signals import post_clean from utilities.utils import serialize_object @@ -98,7 +100,7 @@ class CustomFieldsMixin(models.Model): """ return self.custom_field_data - def get_custom_fields(self): + def get_custom_fields(self, omit_hidden=False): """ Return a dictionary of custom fields for a single object in the form `{field: value}`. @@ -112,11 +114,25 @@ class CustomFieldsMixin(models.Model): data = {} for field in CustomField.objects.get_for_model(self): + # Skip fields that are hidden if 'omit_hidden' is set + if omit_hidden and field.ui_visibility == CustomFieldVisibilityChoices.VISIBILITY_HIDDEN: + continue + value = self.custom_field_data.get(field.name) data[field] = field.deserialize(value) return data + def get_custom_fields_by_group(self): + """ + Return a dictionary of custom field/value mappings organized by group. Hidden fields are omitted. + """ + grouped_custom_fields = defaultdict(dict) + for cf, value in self.get_custom_fields(omit_hidden=True).items(): + grouped_custom_fields[cf.group_name][cf] = value + + return dict(grouped_custom_fields) + def clean(self): super().clean() from extras.models import CustomField diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 999e39479b9..446198c6165 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -29,7 +29,7 @@ django.utils.encoding.force_text = force_str # Environment setup # -VERSION = '3.2.3' +VERSION = '3.3.0-dev' # Hostname HOSTNAME = platform.node() @@ -84,6 +84,7 @@ if BASE_PATH: CORS_ORIGIN_ALLOW_ALL = getattr(configuration, 'CORS_ORIGIN_ALLOW_ALL', False) CORS_ORIGIN_REGEX_WHITELIST = getattr(configuration, 'CORS_ORIGIN_REGEX_WHITELIST', []) CORS_ORIGIN_WHITELIST = getattr(configuration, 'CORS_ORIGIN_WHITELIST', []) +CSRF_COOKIE_NAME = getattr(configuration, 'CSRF_COOKIE_NAME', 'csrftoken') CSRF_TRUSTED_ORIGINS = getattr(configuration, 'CSRF_TRUSTED_ORIGINS', []) DATE_FORMAT = getattr(configuration, 'DATE_FORMAT', 'N j, Y') DATETIME_FORMAT = getattr(configuration, 'DATETIME_FORMAT', 'N j, Y g:i a') @@ -95,6 +96,7 @@ EXEMPT_VIEW_PERMISSIONS = getattr(configuration, 'EXEMPT_VIEW_PERMISSIONS', []) FIELD_CHOICES = getattr(configuration, 'FIELD_CHOICES', {}) HTTP_PROXIES = getattr(configuration, 'HTTP_PROXIES', None) INTERNAL_IPS = getattr(configuration, 'INTERNAL_IPS', ('127.0.0.1', '::1')) +JINJA2_FILTERS = getattr(configuration, 'JINJA2_FILTERS', {}) LOGGING = getattr(configuration, 'LOGGING', {}) LOGIN_PERSISTENCE = getattr(configuration, 'LOGIN_PERSISTENCE', False) LOGIN_REQUIRED = getattr(configuration, 'LOGIN_REQUIRED', False) @@ -422,6 +424,8 @@ LOGIN_REDIRECT_URL = f'/{BASE_PATH}' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +TEST_RUNNER = "django_rich.test.RichRunner" + # Exclude potentially sensitive models from wildcard view exemption. These may still be exempted # by specifying the model individually in the EXEMPT_VIEW_PERMISSIONS configuration parameter. EXEMPT_EXCLUDE_MODELS = ( @@ -511,6 +515,7 @@ REST_FRAMEWORK = { ), 'DEFAULT_FILTER_BACKENDS': ( 'django_filters.rest_framework.DjangoFilterBackend', + 'rest_framework.filters.OrderingFilter', ), 'DEFAULT_METADATA_CLASS': 'netbox.api.metadata.BulkOperationMetadata', 'DEFAULT_PAGINATION_CLASS': 'netbox.api.pagination.OptionalLimitOffsetPagination', diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 801b9776698..7da241566f3 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -90,6 +90,15 @@ class TemplateColumn(tables.TemplateColumn): """ PLACEHOLDER = mark_safe('—') + def __init__(self, export_raw=False, **kwargs): + """ + Args: + export_raw: If true, data export returns the raw field value rather than the rendered template. (Default: + False) + """ + super().__init__(**kwargs) + self.export_raw = export_raw + def render(self, *args, **kwargs): ret = super().render(*args, **kwargs) if not ret.strip(): @@ -97,6 +106,10 @@ class TemplateColumn(tables.TemplateColumn): return ret def value(self, **kwargs): + if self.export_raw: + # Skip template rendering and export raw value + return kwargs.get('value') + ret = super().value(**kwargs) if ret == self.PLACEHOLDER: return '' @@ -153,6 +166,7 @@ class ActionsItem: title: str icon: str permission: Optional[str] = None + css_class: Optional[str] = 'secondary' class ActionsColumn(tables.Column): @@ -162,19 +176,22 @@ class ActionsColumn(tables.Column): :param actions: The ordered list of dropdown menu items to include :param extra_buttons: A Django template string which renders additional buttons preceding the actions dropdown + :param split_actions: When True, converts the actions dropdown menu into a split button with first action as the + direct button link and icon (default: True) """ attrs = {'td': {'class': 'text-end text-nowrap noprint'}} empty_values = () actions = { - 'edit': ActionsItem('Edit', 'pencil', 'change'), - 'delete': ActionsItem('Delete', 'trash-can-outline', 'delete'), + 'edit': ActionsItem('Edit', 'pencil', 'change', 'warning'), + 'delete': ActionsItem('Delete', 'trash-can-outline', 'delete', 'danger'), 'changelog': ActionsItem('Changelog', 'history'), } - def __init__(self, *args, actions=('edit', 'delete', 'changelog'), extra_buttons='', **kwargs): + def __init__(self, *args, actions=('edit', 'delete', 'changelog'), extra_buttons='', split_actions=True, **kwargs): super().__init__(*args, **kwargs) self.extra_buttons = extra_buttons + self.split_actions = split_actions # Determine which actions to enable self.actions = { @@ -192,32 +209,62 @@ class ActionsColumn(tables.Column): model = table.Meta.model request = getattr(table, 'context', {}).get('request') url_appendix = f'?return_url={request.path}' if request else '' + html = '' - links = [] + # Compile actions menu + button = None + dropdown_class = 'secondary' + dropdown_links = [] user = getattr(request, 'user', AnonymousUser()) - for action, attrs in self.actions.items(): + for idx, (action, attrs) in enumerate(self.actions.items()): permission = f'{model._meta.app_label}.{attrs.permission}_{model._meta.model_name}' if attrs.permission is None or user.has_perm(permission): url = reverse(get_viewname(model, action), kwargs={'pk': record.pk}) - links.append(f'
"+tn+"
",1);default:return o(tn,0)}}}function U(tn){tn&&tn()}function a(tn,en){return Object.prototype.toString.call(tn)==="[object "+en+"]"}function f(tn){return a(tn,"Function")}function g(tn){return a(tn,"Object")}function j(tn){var en="htmx-internal-data",nn=tn[en];return nn||(nn=tn[en]={}),nn}function p(tn){var en=[];if(tn)for(var nn=0;nn"+tn+"
",1);default:return o(tn,0)}}}function U(tn){tn&&tn()}function a(tn,en){return Object.prototype.toString.call(tn)==="[object "+en+"]"}function f(tn){return a(tn,"Function")}function g(tn){return a(tn,"Object")}function j(tn){var en="htmx-internal-data",nn=tn[en];return nn||(nn=tn[en]={}),nn}function p(tn){var en=[];if(tn)for(var nn=0;nn',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:[0,0],container:!1,fallbackPlacements:["top","right","bottom","left"],boundary:"clippingParents",customClass:"",sanitize:!0,sanitizeFn:null,allowList:hx,popperConfig:null},Ex={HIDE:`hide${ii}`,HIDDEN:`hidden${ii}`,SHOW:`show${ii}`,SHOWN:`shown${ii}`,INSERTED:`inserted${ii}`,CLICK:`click${ii}`,FOCUSIN:`focusin${ii}`,FOCUSOUT:`focusout${ii}`,MOUSEENTER:`mouseenter${ii}`,MOUSELEAVE:`mouseleave${ii}`},Ia="fade",Eh="modal",Ts="show",Os="show",Lc="out",_x=".tooltip-inner",As="hover",Dc="focus",Sx="click",wx="manual",oi=class extends Gr{constructor(en,nn){if(typeof _a=="undefined")throw new TypeError("Bootstrap's tooltips require Popper (https://popper.js.org)");super(en);this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this._config=this._getConfig(nn),this.tip=null,this._setListeners()}static get Default(){return yx}static get NAME(){return bh}static get Event(){return Ex}static get DefaultType(){return vx}enable(){this._isEnabled=!0}disable(){this._isEnabled=!1}toggleEnabled(){this._isEnabled=!this._isEnabled}toggle(en){if(!!this._isEnabled)if(en){let nn=this._initializeOnDelegatedTarget(en);nn._activeTrigger.click=!nn._activeTrigger.click,nn._isWithActiveTrigger()?nn._enter(null,nn):nn._leave(null,nn)}else{if(this.getTipElement().classList.contains(Ts)){this._leave(null,this);return}this._enter(null,this)}}dispose(){clearTimeout(this._timeout),Mn.off(this._element.closest(`.${Eh}`),"hide.bs.modal",this._hideModalHandler),this.tip&&this.tip.remove(),this._popper&&this._popper.destroy(),super.dispose()}show(){if(this._element.style.display==="none")throw new Error("Please use show on visible elements");if(!(this.isWithContent()&&this._isEnabled))return;let en=Mn.trigger(this._element,this.constructor.Event.SHOW),nn=wd(this._element),rn=nn===null?this._element.ownerDocument.documentElement.contains(this._element):nn.contains(this._element);if(en.defaultPrevented||!rn)return;let on=this.getTipElement(),an=Ed(this.constructor.NAME);on.setAttribute("id",an),this._element.setAttribute("aria-describedby",an),this.setContent(),this._config.animation&&on.classList.add(Ia);let ln=typeof this._config.placement=="function"?this._config.placement.call(this,on,this._element):this._config.placement,cn=this._getAttachment(ln);this._addAttachmentClass(cn);let{container:dn}=this._config;lo.set(on,this.constructor.DATA_KEY,this),this._element.ownerDocument.documentElement.contains(this.tip)||(dn.appendChild(on),Mn.trigger(this._element,this.constructor.Event.INSERTED)),this._popper?this._popper.update():this._popper=Ea(this._element,on,this._getPopperConfig(cn)),on.classList.add(Ts);let fn=typeof this._config.customClass=="function"?this._config.customClass():this._config.customClass;fn&&on.classList.add(...fn.split(" ")),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(hn=>{Mn.on(hn,"mouseover",wa)});let un=()=>{let hn=this._hoverState;this._hoverState=null,Mn.trigger(this._element,this.constructor.Event.SHOWN),hn===Lc&&this._leave(null,this)},gn=this.tip.classList.contains(Ia);this._queueCallback(un,this.tip,gn)}hide(){if(!this._popper)return;let en=this.getTipElement(),nn=()=>{this._isWithActiveTrigger()||(this._hoverState!==Os&&en.remove(),this._cleanTipClass(),this._element.removeAttribute("aria-describedby"),Mn.trigger(this._element,this.constructor.Event.HIDDEN),this._popper&&(this._popper.destroy(),this._popper=null))};if(Mn.trigger(this._element,this.constructor.Event.HIDE).defaultPrevented)return;en.classList.remove(Ts),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(an=>Mn.off(an,"mouseover",wa)),this._activeTrigger[Sx]=!1,this._activeTrigger[Dc]=!1,this._activeTrigger[As]=!1;let on=this.tip.classList.contains(Ia);this._queueCallback(nn,this.tip,on),this._hoverState=""}update(){this._popper!==null&&this._popper.update()}isWithContent(){return Boolean(this.getTitle())}getTipElement(){if(this.tip)return this.tip;let en=document.createElement("div");return en.innerHTML=this._config.template,this.tip=en.children[0],this.tip}setContent(){let en=this.getTipElement();this.setElementContent(Vn.findOne(_x,en),this.getTitle()),en.classList.remove(Ia,Ts)}setElementContent(en,nn){if(en!==null){if(qi(nn)){nn=Bo(nn),this._config.html?nn.parentNode!==en&&(en.innerHTML="",en.appendChild(nn)):en.textContent=nn.textContent;return}this._config.html?(this._config.sanitize&&(nn=vh(nn,this._config.allowList,this._config.sanitizeFn)),en.innerHTML=nn):en.textContent=nn}}getTitle(){let en=this._element.getAttribute("data-bs-original-title");return en||(en=typeof this._config.title=="function"?this._config.title.call(this._element):this._config.title),en}updateAttachment(en){return en==="right"?"end":en==="left"?"start":en}_initializeOnDelegatedTarget(en,nn){let rn=this.constructor.DATA_KEY;return nn=nn||lo.get(en.delegateTarget,rn),nn||(nn=new this.constructor(en.delegateTarget,this._getDelegateConfig()),lo.set(en.delegateTarget,rn,nn)),nn}_getOffset(){let{offset:en}=this._config;return typeof en=="string"?en.split(",").map(nn=>Number.parseInt(nn,10)):typeof en=="function"?nn=>en(nn,this._element):en}_getPopperConfig(en){let nn={placement:en,modifiers:[{name:"flip",options:{fallbackPlacements:this._config.fallbackPlacements}},{name:"offset",options:{offset:this._getOffset()}},{name:"preventOverflow",options:{boundary:this._config.boundary}},{name:"arrow",options:{element:`.${this.constructor.NAME}-arrow`}},{name:"onChange",enabled:!0,phase:"afterWrite",fn:rn=>this._handlePopperPlacementChange(rn)}],onFirstUpdate:rn=>{rn.options.placement!==rn.placement&&this._handlePopperPlacementChange(rn)}};return Jn(Jn({},nn),typeof this._config.popperConfig=="function"?this._config.popperConfig(nn):this._config.popperConfig)}_addAttachmentClass(en){this.getTipElement().classList.add(`${yh}-${this.updateAttachment(en)}`)}_getAttachment(en){return bx[en.toUpperCase()]}_setListeners(){this._config.trigger.split(" ").forEach(nn=>{if(nn==="click")Mn.on(this._element,this.constructor.Event.CLICK,this._config.selector,rn=>this.toggle(rn));else if(nn!==wx){let rn=nn===As?this.constructor.Event.MOUSEENTER:this.constructor.Event.FOCUSIN,on=nn===As?this.constructor.Event.MOUSELEAVE:this.constructor.Event.FOCUSOUT;Mn.on(this._element,rn,this._config.selector,an=>this._enter(an)),Mn.on(this._element,on,this._config.selector,an=>this._leave(an))}}),this._hideModalHandler=()=>{this._element&&this.hide()},Mn.on(this._element.closest(`.${Eh}`),"hide.bs.modal",this._hideModalHandler),this._config.selector?this._config=ca(Jn({},this._config),{trigger:"manual",selector:""}):this._fixTitle()}_fixTitle(){let en=this._element.getAttribute("title"),nn=typeof this._element.getAttribute("data-bs-original-title");(en||nn!=="string")&&(this._element.setAttribute("data-bs-original-title",en||""),en&&!this._element.getAttribute("aria-label")&&!this._element.textContent&&this._element.setAttribute("aria-label",en),this._element.setAttribute("title",""))}_enter(en,nn){if(nn=this._initializeOnDelegatedTarget(en,nn),en&&(nn._activeTrigger[en.type==="focusin"?Dc:As]=!0),nn.getTipElement().classList.contains(Ts)||nn._hoverState===Os){nn._hoverState=Os;return}if(clearTimeout(nn._timeout),nn._hoverState=Os,!nn._config.delay||!nn._config.delay.show){nn.show();return}nn._timeout=setTimeout(()=>{nn._hoverState===Os&&nn.show()},nn._config.delay.show)}_leave(en,nn){if(nn=this._initializeOnDelegatedTarget(en,nn),en&&(nn._activeTrigger[en.type==="focusout"?Dc:As]=nn._element.contains(en.relatedTarget)),!nn._isWithActiveTrigger()){if(clearTimeout(nn._timeout),nn._hoverState=Lc,!nn._config.delay||!nn._config.delay.hide){nn.hide();return}nn._timeout=setTimeout(()=>{nn._hoverState===Lc&&nn.hide()},nn._config.delay.hide)}}_isWithActiveTrigger(){for(let en in this._activeTrigger)if(this._activeTrigger[en])return!0;return!1}_getConfig(en){let nn=Or.getDataAttributes(this._element);return Object.keys(nn).forEach(rn=>{gx.has(rn)&&delete nn[rn]}),en=Jn(Jn(Jn({},this.constructor.Default),nn),typeof en=="object"&&en?en:{}),en.container=en.container===!1?document.body:Bo(en.container),typeof en.delay=="number"&&(en.delay={show:en.delay,hide:en.delay}),typeof en.title=="number"&&(en.title=en.title.toString()),typeof en.content=="number"&&(en.content=en.content.toString()),wi(bh,en,this.constructor.DefaultType),en.sanitize&&(en.template=vh(en.template,en.allowList,en.sanitizeFn)),en}_getDelegateConfig(){let en={};if(this._config)for(let nn in this._config)this.constructor.Default[nn]!==this._config[nn]&&(en[nn]=this._config[nn]);return en}_cleanTipClass(){let en=this.getTipElement(),nn=en.getAttribute("class").match(mx);nn!==null&&nn.length>0&&nn.map(rn=>rn.trim()).forEach(rn=>en.classList.remove(rn))}_handlePopperPlacementChange(en){let{state:nn}=en;!nn||(this.tip=nn.elements.popper,this._cleanTipClass(),this._addAttachmentClass(this._getAttachment(nn.placement)))}static jQueryInterface(en){return this.each(function(){let nn=oi.getOrCreateInstance(this,en);if(typeof en=="string"){if(typeof nn[en]=="undefined")throw new TypeError(`No method named "${en}"`);nn[en]()}})}};Kr(oi);var xx="popover",Tx="bs.popover",si=`.${Tx}`,_h="bs-popover",Ox=new RegExp(`(^|\\s)${_h}\\S+`,"g"),Ax=ca(Jn({},oi.Default),{placement:"right",offset:[0,8],trigger:"click",content:"",template:'
'}),Cx=ca(Jn({},oi.DefaultType),{content:"(string|element|function)"}),Lx={HIDE:`hide${si}`,HIDDEN:`hidden${si}`,SHOW:`show${si}`,SHOWN:`shown${si}`,INSERTED:`inserted${si}`,CLICK:`click${si}`,FOCUSIN:`focusin${si}`,FOCUSOUT:`focusout${si}`,MOUSEENTER:`mouseenter${si}`,MOUSELEAVE:`mouseleave${si}`},Dx="fade",Mx="show",Sh=".popover-header",wh=".popover-body",go=class extends oi{static get Default(){return Ax}static get NAME(){return xx}static get Event(){return Lx}static get DefaultType(){return Cx}isWithContent(){return this.getTitle()||this._getContent()}getTipElement(){return this.tip?this.tip:(this.tip=super.getTipElement(),this.getTitle()||Vn.findOne(Sh,this.tip).remove(),this._getContent()||Vn.findOne(wh,this.tip).remove(),this.tip)}setContent(){let en=this.getTipElement();this.setElementContent(Vn.findOne(Sh,en),this.getTitle());let nn=this._getContent();typeof nn=="function"&&(nn=nn.call(this._element)),this.setElementContent(Vn.findOne(wh,en),nn),en.classList.remove(Dx,Mx)}_addAttachmentClass(en){this.getTipElement().classList.add(`${_h}-${this.updateAttachment(en)}`)}_getContent(){return this._element.getAttribute("data-bs-content")||this._config.content}_cleanTipClass(){let en=this.getTipElement(),nn=en.getAttribute("class").match(Ox);nn!==null&&nn.length>0&&nn.map(rn=>rn.trim()).forEach(rn=>en.classList.remove(rn))}static jQueryInterface(en){return this.each(function(){let nn=go.getOrCreateInstance(this,en);if(typeof en=="string"){if(typeof nn[en]=="undefined")throw new TypeError(`No method named "${en}"`);nn[en]()}})}};Kr(go);var Mc="scrollspy",Ix="bs.scrollspy",Pa=`.${Ix}`,Px=".data-api",xh={offset:10,method:"auto",target:""},kx={offset:"number",method:"string",target:"(string|element)"},Nx=`activate${Pa}`,Rx=`scroll${Pa}`,jx=`load${Pa}${Px}`,Th="dropdown-item",vo="active",qx='[data-bs-spy="scroll"]',Hx=".nav, .list-group",Ic=".nav-link",Bx=".nav-item",Oh=".list-group-item",Fx=".dropdown",$x=".dropdown-toggle",zx="offset",Ah="position",Cs=class extends Gr{constructor(en,nn){super(en);this._scrollElement=this._element.tagName==="BODY"?window:this._element,this._config=this._getConfig(nn),this._selector=`${this._config.target} ${Ic}, ${this._config.target} ${Oh}, ${this._config.target} .${Th}`,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,Mn.on(this._scrollElement,Rx,()=>this._process()),this.refresh(),this._process()}static get Default(){return xh}static get NAME(){return Mc}refresh(){let en=this._scrollElement===this._scrollElement.window?zx:Ah,nn=this._config.method==="auto"?en:this._config.method,rn=nn===Ah?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),Vn.find(this._selector).map(an=>{let ln=mc(an),cn=ln?Vn.findOne(ln):null;if(cn){let dn=cn.getBoundingClientRect();if(dn.width||dn.height)return[Or[nn](cn).top+rn,ln]}return null}).filter(an=>an).sort((an,ln)=>an[0]-ln[0]).forEach(an=>{this._offsets.push(an[0]),this._targets.push(an[1])})}dispose(){Mn.off(this._scrollElement,Pa),super.dispose()}_getConfig(en){if(en=Jn(Jn(Jn({},xh),Or.getDataAttributes(this._element)),typeof en=="object"&&en?en:{}),typeof en.target!="string"&&qi(en.target)){let{id:nn}=en.target;nn||(nn=Ed(Mc),en.target.id=nn),en.target=`#${nn}`}return wi(Mc,en,kx),en}_getScrollTop(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop}_getScrollHeight(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}_getOffsetHeight(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height}_process(){let en=this._getScrollTop()+this._config.offset,nn=this._getScrollHeight(),rn=this._config.offset+nn-this._getOffsetHeight();if(this._scrollHeight!==nn&&this.refresh(),en>=rn){let on=this._targets[this._targets.length-1];this._activeTarget!==on&&this._activate(on);return}if(this._activeTarget&&en
',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:[0,0],container:!1,fallbackPlacements:["top","right","bottom","left"],boundary:"clippingParents",customClass:"",sanitize:!0,sanitizeFn:null,allowList:vx,popperConfig:null},xx={HIDE:`hide${ii}`,HIDDEN:`hidden${ii}`,SHOW:`show${ii}`,SHOWN:`shown${ii}`,INSERTED:`inserted${ii}`,CLICK:`click${ii}`,FOCUSIN:`focusin${ii}`,FOCUSOUT:`focusout${ii}`,MOUSEENTER:`mouseenter${ii}`,MOUSELEAVE:`mouseleave${ii}`},ka="fade",Eh="modal",Os="show",Cs="show",Lc="out",Tx=".tooltip-inner",As="hover",Dc="focus",Ox="click",Cx="manual",oi=class extends Gr{constructor(en,nn){if(typeof Sa=="undefined")throw new TypeError("Bootstrap's tooltips require Popper (https://popper.js.org)");super(en);this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this._config=this._getConfig(nn),this.tip=null,this._setListeners()}static get Default(){return wx}static get NAME(){return bh}static get Event(){return xx}static get DefaultType(){return _x}enable(){this._isEnabled=!0}disable(){this._isEnabled=!1}toggleEnabled(){this._isEnabled=!this._isEnabled}toggle(en){if(!!this._isEnabled)if(en){let nn=this._initializeOnDelegatedTarget(en);nn._activeTrigger.click=!nn._activeTrigger.click,nn._isWithActiveTrigger()?nn._enter(null,nn):nn._leave(null,nn)}else{if(this.getTipElement().classList.contains(Os)){this._leave(null,this);return}this._enter(null,this)}}dispose(){clearTimeout(this._timeout),Mn.off(this._element.closest(`.${Eh}`),"hide.bs.modal",this._hideModalHandler),this.tip&&this.tip.remove(),this._popper&&this._popper.destroy(),super.dispose()}show(){if(this._element.style.display==="none")throw new Error("Please use show on visible elements");if(!(this.isWithContent()&&this._isEnabled))return;let en=Mn.trigger(this._element,this.constructor.Event.SHOW),nn=wd(this._element),rn=nn===null?this._element.ownerDocument.documentElement.contains(this._element):nn.contains(this._element);if(en.defaultPrevented||!rn)return;let on=this.getTipElement(),an=Ed(this.constructor.NAME);on.setAttribute("id",an),this._element.setAttribute("aria-describedby",an),this.setContent(),this._config.animation&&on.classList.add(ka);let ln=typeof this._config.placement=="function"?this._config.placement.call(this,on,this._element):this._config.placement,cn=this._getAttachment(ln);this._addAttachmentClass(cn);let{container:dn}=this._config;lo.set(on,this.constructor.DATA_KEY,this),this._element.ownerDocument.documentElement.contains(this.tip)||(dn.appendChild(on),Mn.trigger(this._element,this.constructor.Event.INSERTED)),this._popper?this._popper.update():this._popper=_a(this._element,on,this._getPopperConfig(cn)),on.classList.add(Os);let fn=typeof this._config.customClass=="function"?this._config.customClass():this._config.customClass;fn&&on.classList.add(...fn.split(" ")),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(hn=>{Mn.on(hn,"mouseover",xa)});let un=()=>{let hn=this._hoverState;this._hoverState=null,Mn.trigger(this._element,this.constructor.Event.SHOWN),hn===Lc&&this._leave(null,this)},gn=this.tip.classList.contains(ka);this._queueCallback(un,this.tip,gn)}hide(){if(!this._popper)return;let en=this.getTipElement(),nn=()=>{this._isWithActiveTrigger()||(this._hoverState!==Cs&&en.remove(),this._cleanTipClass(),this._element.removeAttribute("aria-describedby"),Mn.trigger(this._element,this.constructor.Event.HIDDEN),this._popper&&(this._popper.destroy(),this._popper=null))};if(Mn.trigger(this._element,this.constructor.Event.HIDE).defaultPrevented)return;en.classList.remove(Os),"ontouchstart"in document.documentElement&&[].concat(...document.body.children).forEach(an=>Mn.off(an,"mouseover",xa)),this._activeTrigger[Ox]=!1,this._activeTrigger[Dc]=!1,this._activeTrigger[As]=!1;let on=this.tip.classList.contains(ka);this._queueCallback(nn,this.tip,on),this._hoverState=""}update(){this._popper!==null&&this._popper.update()}isWithContent(){return Boolean(this.getTitle())}getTipElement(){if(this.tip)return this.tip;let en=document.createElement("div");return en.innerHTML=this._config.template,this.tip=en.children[0],this.tip}setContent(){let en=this.getTipElement();this.setElementContent(Vn.findOne(Tx,en),this.getTitle()),en.classList.remove(ka,Os)}setElementContent(en,nn){if(en!==null){if(qi(nn)){nn=Bo(nn),this._config.html?nn.parentNode!==en&&(en.innerHTML="",en.appendChild(nn)):en.textContent=nn.textContent;return}this._config.html?(this._config.sanitize&&(nn=vh(nn,this._config.allowList,this._config.sanitizeFn)),en.innerHTML=nn):en.textContent=nn}}getTitle(){let en=this._element.getAttribute("data-bs-original-title");return en||(en=typeof this._config.title=="function"?this._config.title.call(this._element):this._config.title),en}updateAttachment(en){return en==="right"?"end":en==="left"?"start":en}_initializeOnDelegatedTarget(en,nn){let rn=this.constructor.DATA_KEY;return nn=nn||lo.get(en.delegateTarget,rn),nn||(nn=new this.constructor(en.delegateTarget,this._getDelegateConfig()),lo.set(en.delegateTarget,rn,nn)),nn}_getOffset(){let{offset:en}=this._config;return typeof en=="string"?en.split(",").map(nn=>Number.parseInt(nn,10)):typeof en=="function"?nn=>en(nn,this._element):en}_getPopperConfig(en){let nn={placement:en,modifiers:[{name:"flip",options:{fallbackPlacements:this._config.fallbackPlacements}},{name:"offset",options:{offset:this._getOffset()}},{name:"preventOverflow",options:{boundary:this._config.boundary}},{name:"arrow",options:{element:`.${this.constructor.NAME}-arrow`}},{name:"onChange",enabled:!0,phase:"afterWrite",fn:rn=>this._handlePopperPlacementChange(rn)}],onFirstUpdate:rn=>{rn.options.placement!==rn.placement&&this._handlePopperPlacementChange(rn)}};return Jn(Jn({},nn),typeof this._config.popperConfig=="function"?this._config.popperConfig(nn):this._config.popperConfig)}_addAttachmentClass(en){this.getTipElement().classList.add(`${yh}-${this.updateAttachment(en)}`)}_getAttachment(en){return Sx[en.toUpperCase()]}_setListeners(){this._config.trigger.split(" ").forEach(nn=>{if(nn==="click")Mn.on(this._element,this.constructor.Event.CLICK,this._config.selector,rn=>this.toggle(rn));else if(nn!==Cx){let rn=nn===As?this.constructor.Event.MOUSEENTER:this.constructor.Event.FOCUSIN,on=nn===As?this.constructor.Event.MOUSELEAVE:this.constructor.Event.FOCUSOUT;Mn.on(this._element,rn,this._config.selector,an=>this._enter(an)),Mn.on(this._element,on,this._config.selector,an=>this._leave(an))}}),this._hideModalHandler=()=>{this._element&&this.hide()},Mn.on(this._element.closest(`.${Eh}`),"hide.bs.modal",this._hideModalHandler),this._config.selector?this._config=ua(Jn({},this._config),{trigger:"manual",selector:""}):this._fixTitle()}_fixTitle(){let en=this._element.getAttribute("title"),nn=typeof this._element.getAttribute("data-bs-original-title");(en||nn!=="string")&&(this._element.setAttribute("data-bs-original-title",en||""),en&&!this._element.getAttribute("aria-label")&&!this._element.textContent&&this._element.setAttribute("aria-label",en),this._element.setAttribute("title",""))}_enter(en,nn){if(nn=this._initializeOnDelegatedTarget(en,nn),en&&(nn._activeTrigger[en.type==="focusin"?Dc:As]=!0),nn.getTipElement().classList.contains(Os)||nn._hoverState===Cs){nn._hoverState=Cs;return}if(clearTimeout(nn._timeout),nn._hoverState=Cs,!nn._config.delay||!nn._config.delay.show){nn.show();return}nn._timeout=setTimeout(()=>{nn._hoverState===Cs&&nn.show()},nn._config.delay.show)}_leave(en,nn){if(nn=this._initializeOnDelegatedTarget(en,nn),en&&(nn._activeTrigger[en.type==="focusout"?Dc:As]=nn._element.contains(en.relatedTarget)),!nn._isWithActiveTrigger()){if(clearTimeout(nn._timeout),nn._hoverState=Lc,!nn._config.delay||!nn._config.delay.hide){nn.hide();return}nn._timeout=setTimeout(()=>{nn._hoverState===Lc&&nn.hide()},nn._config.delay.hide)}}_isWithActiveTrigger(){for(let en in this._activeTrigger)if(this._activeTrigger[en])return!0;return!1}_getConfig(en){let nn=Or.getDataAttributes(this._element);return Object.keys(nn).forEach(rn=>{Ex.has(rn)&&delete nn[rn]}),en=Jn(Jn(Jn({},this.constructor.Default),nn),typeof en=="object"&&en?en:{}),en.container=en.container===!1?document.body:Bo(en.container),typeof en.delay=="number"&&(en.delay={show:en.delay,hide:en.delay}),typeof en.title=="number"&&(en.title=en.title.toString()),typeof en.content=="number"&&(en.content=en.content.toString()),wi(bh,en,this.constructor.DefaultType),en.sanitize&&(en.template=vh(en.template,en.allowList,en.sanitizeFn)),en}_getDelegateConfig(){let en={};if(this._config)for(let nn in this._config)this.constructor.Default[nn]!==this._config[nn]&&(en[nn]=this._config[nn]);return en}_cleanTipClass(){let en=this.getTipElement(),nn=en.getAttribute("class").match(yx);nn!==null&&nn.length>0&&nn.map(rn=>rn.trim()).forEach(rn=>en.classList.remove(rn))}_handlePopperPlacementChange(en){let{state:nn}=en;!nn||(this.tip=nn.elements.popper,this._cleanTipClass(),this._addAttachmentClass(this._getAttachment(nn.placement)))}static jQueryInterface(en){return this.each(function(){let nn=oi.getOrCreateInstance(this,en);if(typeof en=="string"){if(typeof nn[en]=="undefined")throw new TypeError(`No method named "${en}"`);nn[en]()}})}};Kr(oi);var Ax="popover",Lx="bs.popover",si=`.${Lx}`,_h="bs-popover",Dx=new RegExp(`(^|\\s)${_h}\\S+`,"g"),Mx=ua(Jn({},oi.Default),{placement:"right",offset:[0,8],trigger:"click",content:"",template:'
'}),Ix=ua(Jn({},oi.DefaultType),{content:"(string|element|function)"}),kx={HIDE:`hide${si}`,HIDDEN:`hidden${si}`,SHOW:`show${si}`,SHOWN:`shown${si}`,INSERTED:`inserted${si}`,CLICK:`click${si}`,FOCUSIN:`focusin${si}`,FOCUSOUT:`focusout${si}`,MOUSEENTER:`mouseenter${si}`,MOUSELEAVE:`mouseleave${si}`},Px="fade",Nx="show",Sh=".popover-header",wh=".popover-body",go=class extends oi{static get Default(){return Mx}static get NAME(){return Ax}static get Event(){return kx}static get DefaultType(){return Ix}isWithContent(){return this.getTitle()||this._getContent()}getTipElement(){return this.tip?this.tip:(this.tip=super.getTipElement(),this.getTitle()||Vn.findOne(Sh,this.tip).remove(),this._getContent()||Vn.findOne(wh,this.tip).remove(),this.tip)}setContent(){let en=this.getTipElement();this.setElementContent(Vn.findOne(Sh,en),this.getTitle());let nn=this._getContent();typeof nn=="function"&&(nn=nn.call(this._element)),this.setElementContent(Vn.findOne(wh,en),nn),en.classList.remove(Px,Nx)}_addAttachmentClass(en){this.getTipElement().classList.add(`${_h}-${this.updateAttachment(en)}`)}_getContent(){return this._element.getAttribute("data-bs-content")||this._config.content}_cleanTipClass(){let en=this.getTipElement(),nn=en.getAttribute("class").match(Dx);nn!==null&&nn.length>0&&nn.map(rn=>rn.trim()).forEach(rn=>en.classList.remove(rn))}static jQueryInterface(en){return this.each(function(){let nn=go.getOrCreateInstance(this,en);if(typeof en=="string"){if(typeof nn[en]=="undefined")throw new TypeError(`No method named "${en}"`);nn[en]()}})}};Kr(go);var Mc="scrollspy",Rx="bs.scrollspy",Pa=`.${Rx}`,jx=".data-api",xh={offset:10,method:"auto",target:""},qx={offset:"number",method:"string",target:"(string|element)"},Hx=`activate${Pa}`,Bx=`scroll${Pa}`,Fx=`load${Pa}${jx}`,Th="dropdown-item",vo="active",$x='[data-bs-spy="scroll"]',zx=".nav, .list-group",Ic=".nav-link",Wx=".nav-item",Oh=".list-group-item",Vx=".dropdown",Ux=".dropdown-toggle",Yx="offset",Ch="position",Ls=class extends Gr{constructor(en,nn){super(en);this._scrollElement=this._element.tagName==="BODY"?window:this._element,this._config=this._getConfig(nn),this._selector=`${this._config.target} ${Ic}, ${this._config.target} ${Oh}, ${this._config.target} .${Th}`,this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,Mn.on(this._scrollElement,Bx,()=>this._process()),this.refresh(),this._process()}static get Default(){return xh}static get NAME(){return Mc}refresh(){let en=this._scrollElement===this._scrollElement.window?Yx:Ch,nn=this._config.method==="auto"?en:this._config.method,rn=nn===Ch?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),Vn.find(this._selector).map(an=>{let ln=mc(an),cn=ln?Vn.findOne(ln):null;if(cn){let dn=cn.getBoundingClientRect();if(dn.width||dn.height)return[Or[nn](cn).top+rn,ln]}return null}).filter(an=>an).sort((an,ln)=>an[0]-ln[0]).forEach(an=>{this._offsets.push(an[0]),this._targets.push(an[1])})}dispose(){Mn.off(this._scrollElement,Pa),super.dispose()}_getConfig(en){if(en=Jn(Jn(Jn({},xh),Or.getDataAttributes(this._element)),typeof en=="object"&&en?en:{}),typeof en.target!="string"&&qi(en.target)){let{id:nn}=en.target;nn||(nn=Ed(Mc),en.target.id=nn),en.target=`#${nn}`}return wi(Mc,en,qx),en}_getScrollTop(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop}_getScrollHeight(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}_getOffsetHeight(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height}_process(){let en=this._getScrollTop()+this._config.offset,nn=this._getScrollHeight(),rn=this._config.offset+nn-this._getOffsetHeight();if(this._scrollHeight!==nn&&this.refresh(),en>=rn){let on=this._targets[this._targets.length-1];this._activeTarget!==on&&this._activate(on);return}if(this._activeTarget&&en
Site time: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %} {% else %} - — + {{ ''|placeholder }} {% endif %} @@ -94,7 +94,7 @@ {{ object.physical_address|linebreaksbr }} {% else %} - — + {{ ''|placeholder }} {% endif %} @@ -113,7 +113,7 @@ {{ object.latitude }}, {{ object.longitude }} {% else %} - — + {{ ''|placeholder }} {% endif %} diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html index 4683b775bfa..1ff9f2e9a28 100644 --- a/netbox/templates/dcim/virtualchassis.html +++ b/netbox/templates/dcim/virtualchassis.html @@ -15,74 +15,70 @@ {% block content %}
-
-
- {% include 'inc/panels/custom_fields.html' %}
- {% include 'inc/panels/tags.html' %}
- {% plugin_left_page object %}
+ - Virtual Chassis -
-
-
-
-
- | Domain | -{{ object.domain|placeholder }} | -
|---|---|
| Master | -{{ object.master|linkify }} | -
+
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' %}
+ {% plugin_left_page object %}
Virtual Chassis
+
+
+
+
+ | Domain | +{{ object.domain|placeholder }} | +
|---|---|
| Master | +{{ object.master|linkify }} | +
-
-
- Members -
-
-
-
-
- {% if perms.dcim.change_virtualchassis %}
-
- {% endif %}
+ | Device | -Position | -Master | -Priority | -- {{ vc_member|linkify }} - | -- {% badge vc_member.vc_position show_empty=True %} - | -- {% if object.master == vc_member %} - {% checkmark True %} - {% endif %} - | -- {{ vc_member.vc_priority|placeholder }} - | - - {% endfor %} -
|---|
+
+ {% plugin_right_page object %}
Members
+
+
+
- {% plugin_right_page object %}
+ {% if perms.dcim.change_virtualchassis %}
+
+ {% endif %}
+ | Device | +Position | +Master | +Priority | ++ {{ vc_member|linkify }} + | ++ {% badge vc_member.vc_position show_empty=True %} + | ++ {% if object.master == vc_member %} + {% checkmark True %} + {% endif %} + | ++ {{ vc_member.vc_priority|placeholder }} + | + + {% endfor %} +
|---|
-
{% endblock %}
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index 327f205314f..275391c6145 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -57,7 +57,7 @@
{% if device.rack %}
{{ device.rack }} / {{ device.position }}
{% else %}
- —
+ {{ ''|placeholder }}
{% endif %}
- {% plugin_full_width_page object %}
-
+
+ {% plugin_full_width_page object %}
+
-
- Config Context
-
- {% render_field form.name %}
- {% render_field form.weight %}
- {% render_field form.description %}
- {% render_field form.is_active %}
-
-
-
- Assignment
-
- {% render_field form.regions %}
- {% render_field form.site_groups %}
- {% render_field form.sites %}
- {% render_field form.device_types %}
- {% render_field form.roles %}
- {% render_field form.platforms %}
- {% render_field form.cluster_types %}
- {% render_field form.cluster_groups %}
- {% render_field form.clusters %}
- {% render_field form.tenant_groups %}
- {% render_field form.tenants %}
- {% render_field form.tags %}
-
-
-
-{% endblock %}
diff --git a/netbox/templates/extras/customfield.html b/netbox/templates/extras/customfield.html
index e8c3df460dc..ff4e6e08c3a 100644
--- a/netbox/templates/extras/customfield.html
+++ b/netbox/templates/extras/customfield.html
@@ -19,6 +19,10 @@
Data
-
- {% render_field form.data %}
-
- {{ object.validation_regex }}
{% else %}
- —
+ {{ ''|placeholder }}
{% endif %}
diff --git a/netbox/templates/extras/htmx/report_result.html b/netbox/templates/extras/htmx/report_result.html
index 9b3e9db5f1c..c20bf5fe2e6 100644
--- a/netbox/templates/extras/htmx/report_result.html
+++ b/netbox/templates/extras/htmx/report_result.html
@@ -57,7 +57,7 @@
{% elif obj %}
{{ obj }}
{% else %}
- —
+ {{ ''|placeholder }}
{% endif %}
{{ field.to_field_name }}
{% else %}
- —
+ {{ ''|placeholder }}
{% endif %}
-
+ {% endif %}
{% endwith %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 7867e829b4d..8b628c2f75f 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -52,7 +52,7 @@
{% if object.role %}
{{ object.get_role_display }}
{% else %}
- None
+ {{ ''|placeholder }}
{% endif %}
Custom Fields
-
-
- {% for field, value in custom_fields.items %}
-
+ {% endfor %}
+
+ | - {{ field }} - | -
- {% if field.type == 'integer' and value is not None %}
- {{ value }}
- {% elif field.type == 'longtext' and value %}
- {{ value|markdown }}
- {% elif field.type == 'boolean' and value == True %}
- {% checkmark value true="True" %}
- {% elif field.type == 'boolean' and value == False %}
- {% checkmark value false="False" %}
- {% elif field.type == 'url' and value %}
- {{ value|truncatechars:70 }}
- {% elif field.type == 'json' and value %}
- {{ value|json }}
- {% elif field.type == 'multiselect' and value %}
- {{ value|join:", " }}
- {% elif field.type == 'object' and value %}
- {{ value|linkify }}
- {% elif field.type == 'multiobject' and value %}
- {% for obj in value %}
- {{ obj|linkify }}{% if not forloop.last %}{% endif %} - {% endfor %} - {% elif value %} - {{ value }} - {% elif field.required %} - Not defined - {% else %} - — - {% endif %} - |
-
| + {{ field }} + | +
+ {% if field.type == 'integer' and value is not None %}
+ {{ value }}
+ {% elif field.type == 'longtext' and value %}
+ {{ value|markdown }}
+ {% elif field.type == 'boolean' and value == True %}
+ {% checkmark value true="True" %}
+ {% elif field.type == 'boolean' and value == False %}
+ {% checkmark value false="False" %}
+ {% elif field.type == 'url' and value %}
+ {{ value|truncatechars:70 }}
+ {% elif field.type == 'json' and value %}
+ {{ value|json }}
+ {% elif field.type == 'multiselect' and value %}
+ {{ value|join:", " }}
+ {% elif field.type == 'object' and value %}
+ {{ value|linkify }}
+ {% elif field.type == 'multiobject' and value %}
+ {% for obj in value %}
+ {{ obj|linkify }}{% if not forloop.last %}{% endif %} {% endfor %} - |
+ {% empty %} + {{ ''|placeholder }} + {% endfor %} +
{% include 'inc/panel_table.html' with table=related_ips_table heading='Related IP Addresses' %}
+
+
{% plugin_right_page object %}
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index e2ba76a8279..a47566ff7af 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -39,7 +39,7 @@
{% if aggregate %}
{{ aggregate.prefix }} ({{ aggregate.rir }})
{% else %}
- None
+ {{ ''|placeholder }}
{% endif %}
@@ -52,7 +52,7 @@
{% endif %}
{{ object.site|linkify }}
{% else %}
- None
+ {{ ''|placeholder }}
{% endif %}
@@ -65,7 +65,7 @@
{% endif %}
{{ object.vlan|linkify }}
{% else %}
- None
+ {{ ''|placeholder }}
{% endif %}
@@ -138,7 +138,7 @@
{{ first_available_ip }}
{% endif %}
{% else %}
- None
+ {{ ''|placeholder }}
{% endif %}
{% endwith %}
diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html
index 49570099dcf..a6ef2c6d4ce 100644
--- a/netbox/templates/ipam/role.html
+++ b/netbox/templates/ipam/role.html
@@ -45,7 +45,7 @@
{% if ipranges_count %}
{{ ipranges_count }}
{% else %}
- —
+ {{ ''|placeholder }}
{% endif %}
{% endwith %}
@@ -57,7 +57,7 @@
{% if vlans_count %}
{{ vlans_count }}
{% else %}
- —
+ {{ ''|placeholder }}
{% endif %}
{% endwith %}
diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html
index 71ea20fa59d..47ae70dc931 100644
--- a/netbox/templates/ipam/service.html
+++ b/netbox/templates/ipam/service.html
@@ -44,7 +44,7 @@
{% for ipaddress in object.ipaddresses.all %}
{{ ipaddress|linkify }}+ Services +
+
+ {% if services %}
+
+ {% for service in services %}
+ {% include 'ipam/inc/service.html' %}
+ {% endfor %}
+
+ {% else %}
+
+
+ None
+
+ {% endif %}
+ {% empty %} - None + {{ ''|placeholder }} {% endfor %} diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index f74149ad69c..fd0ba36a397 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -21,7 +21,7 @@ {% endif %} {{ object.site|linkify }} {% else %} - None + {{ ''|placeholder }} {% endif %} @@ -56,7 +56,7 @@ {% if object.role %} {{ object.role }} {% else %} - None + {{ ''|placeholder }} {% endif %} diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html index f55e8789549..8e71628e9c8 100644 --- a/netbox/templates/tenancy/contact.html +++ b/netbox/templates/tenancy/contact.html @@ -35,7 +35,7 @@ {% if object.phone %} {{ object.phone }} {% else %} - None + {{ ''|placeholder }} {% endif %} @@ -45,7 +45,7 @@ {% if object.email %} {{ object.email }} {% else %} - None + {{ ''|placeholder }} {% endif %} diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index e4c1db00667..52c13e1aabf 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -77,6 +77,10 @@
{{ stats.prefix_count }}
Prefixes
+
+
{{ stats.iprange_count }}
+IP Ranges
+{{ stats.ipaddress_count }}
IP addresses
diff --git a/netbox/templates/users/api_tokens.html b/netbox/templates/users/api_tokens.html index a019cbd1fbb..24b32cc9bd8 100644 --- a/netbox/templates/users/api_tokens.html +++ b/netbox/templates/users/api_tokens.html @@ -50,7 +50,14 @@ Disabled {% endif %}
+ Allowed Source IPs
+ {% if token.allowed_ips %} + {{ token.allowed_ips|join:', ' }} + {% else %} + Any + {% endif %} +
{% if token.description %}
+ {% if token.allowed_ips %} + {{ token.allowed_ips|join:', ' }} + {% else %} + Any + {% endif %} +
{{ token.description }} {% endif %} diff --git a/netbox/templates/users/profile.html b/netbox/templates/users/profile.html index 112603126ca..913784c9496 100644 --- a/netbox/templates/users/profile.html +++ b/netbox/templates/users/profile.html @@ -21,7 +21,7 @@ {% if request.user.first_name or request.user.last_name %} {{ request.user.first_name }} {{ request.user.last_name }} {% else %} - — + {{ ''|placeholder }} {% endif %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 0dec4968c2c..f62da6fed5c 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -49,7 +49,7 @@ (NAT: {{ object.primary_ip4.nat_outside.address.ip }}) {% endif %} {% else %} - — + {{ ''|placeholder }} {% endif %} @@ -64,7 +64,7 @@ (NAT: {{ object.primary_ip6.nat_outside.address.ip }}) {% endif %} {% else %} - — + {{ ''|placeholder }} {% endif %} @@ -78,31 +78,39 @@
-
+
- Cluster -
+Cluster
| Site | ++ {{ object.site|linkify|placeholder }} + | +
|---|---|
| Cluster | {% if object.cluster.group %} {{ object.cluster.group|linkify }} / {% endif %} - {{ object.cluster|linkify }} + {{ object.cluster|linkify|placeholder }} |
| Cluster Type | {{ object.cluster.type }} |
| Device | ++ {{ object.device|linkify|placeholder }} + | +
-