Merge pull request #13705 from netbox-community/develop

Release v3.6.1
2026-01-28 20:58:15 +01:00 · 2023-09-06 14:23:36 -04:00 · 2023-09-06 14:04:57 -04:00 · 2023-09-06 10:49:40 -04:00 · 2023-09-06 10:47:18 -04:00 · 2023-09-06 08:44:25 -04:00
89 changed files with 1211 additions and 1439 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -14,7 +14,7 @@ body:
    attributes:
      label: NetBox version
      description: What version of NetBox are you currently running?
-      placeholder: v3.5.8
+      placeholder: v3.6.1
    validations:
      required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -14,7 +14,7 @@ body:
    attributes:
      label: NetBox version
      description: What version of NetBox are you currently running?
-      placeholder: v3.5.8
+      placeholder: v3.6.1
    validations:
      required: true
  - type: dropdown
--- a/contrib/generated_schema.json
+++ b/contrib/generated_schema.json
@@ -332,6 +332,7 @@
                        "100gbase-x-cfp",
                        "100gbase-x-cfp2",
                        "200gbase-x-cfp2",
+                        "400gbase-x-cfp2",
                        "100gbase-x-cfp4",
                        "100gbase-x-cxp",
                        "100gbase-x-cpak",
--- a/docs/administration/replicating-netbox.md
+++ b/docs/administration/replicating-netbox.md
@@ -54,7 +54,7 @@ pg_dump --username netbox --password --host localhost -s netbox > netbox_schema.
 By default, NetBox stores uploaded files (such as image attachments) in its media directory. To fully replicate an instance of NetBox, you'll need to copy both the database and the media files.

 !!! note
-    These operations are not necessary if your installation is utilizing a [remote storage backend](../../configuration/optional-settings/#storage_backend).
+    These operations are not necessary if your installation is utilizing a [remote storage backend](../configuration/system.md#storage_backend).

 ### Archive the Media Directory

--- a/docs/configuration/plugins.md
+++ b/docs/configuration/plugins.md
@@ -4,7 +4,7 @@

 Default: Empty

-A list of installed [NetBox plugins](../../plugins/) to enable. Plugins will not take effect unless they are listed here.
+A list of installed [NetBox plugins](../plugins/index.md) to enable. Plugins will not take effect unless they are listed here.

 !!! warning
    Plugins extend NetBox by allowing external code to run with the same access and privileges as NetBox itself. Only install plugins from trusted sources. The NetBox maintainers make absolutely no guarantees about the integrity or security of your installation with plugins enabled.
--- a/docs/customization/reports.md
+++ b/docs/customization/reports.md
@@ -111,7 +111,7 @@ The following methods are available to log results within a report:

 The recording of one or more failure messages will automatically flag a report as failed. It is advised to log a success for each object that is evaluated so that the results will reflect how many objects are being reported on. (The inclusion of a log message is optional for successes.) Messages recorded with `log()` will appear in a report's results but are not associated with a particular object or status. Log messages also support using markdown syntax and will be rendered on the report result page.

-To perform additional tasks, such as sending an email or calling a webhook, before or after a report is run, extend the `pre_run()` and/or `post_run()` methods, respectively. The status of a completed report is available as `self.failed` and the results object is `self.result`.
+To perform additional tasks, such as sending an email or calling a webhook, before or after a report is run, extend the `pre_run()` and/or `post_run()` methods, respectively.

 By default, reports within a module are ordered alphabetically in the reports list page. To return reports in a specific order, you can define the `report_order` variable at the end of your module. The `report_order` variable is a tuple which contains each Report class in the desired order. Any reports that are omitted from this list will be listed last.

--- a/docs/features/configuration-rendering.md
+++ b/docs/features/configuration-rendering.md
@@ -37,6 +37,14 @@ Configuration templates are written in the [Jinja2 templating language](https://

 When rendered for a specific NetBox device, the template's `device` variable will be populated with the device instance, and `ntp_servers` will be pulled from the device's available context data. The resulting output will be a valid configuration segment that can be applied directly to a compatible network device.

+### Context Data
+
+The objet for which the configuration is being rendered is made available as template context as `device` or `virtualmachine` for devices and virtual machines, respectively. Additionally, NetBox model classes can be accessed by the app or plugin in which they reside. For example:
+
+```
+There are {{ dcim.Site.objects.count() }} sites.
+```
+
 ## Rendering Templates

 ### Device Configurations
--- a/docs/installation/upgrading.md
+++ b/docs/installation/upgrading.md
@@ -59,7 +59,7 @@ Copy `local_requirements.txt`, `configuration.py`, and `ldap_config.py` (if pres

 ```no-highlight
 # Set $OLDVER to the NetBox version currently installed
-NEWVER=3.4.9
+OLDVER=3.4.9
 sudo cp /opt/netbox-$OLDVER/local_requirements.txt /opt/netbox/
 sudo cp /opt/netbox-$OLDVER/netbox/netbox/configuration.py /opt/netbox/netbox/netbox/
 sudo cp /opt/netbox-$OLDVER/netbox/netbox/ldap_config.py /opt/netbox/netbox/netbox/
--- a/docs/media/admin_ui_run_permission.png
+++ b/docs/media/admin_ui_run_permission.png
--- a/docs/models/dcim/platform.md
+++ b/docs/models/dcim/platform.md
@@ -23,17 +23,3 @@ If designated, this platform will be available for use only to devices assigned
 ### Configuration Template

 The default [configuration template](../extras/configtemplate.md) for devices assigned to this platform.
-
-### NAPALM Driver
-
-!!! warning "Deprecated Field"
-    NAPALM integration was removed from NetBox core in v3.5 and is now available as a [plugin](https://github.com/netbox-community/netbox-napalm). This field will be removed in NetBox v3.6.
-
-The [NAPALM driver](https://napalm.readthedocs.io/en/latest/support/index.html) associated with this platform.
-
-### NAPALM Arguments
-
-!!! warning "Deprecated Field"
-    NAPALM integration was removed from NetBox core in v3.5 and is now available as a [plugin](https://github.com/netbox-community/netbox-napalm). This field will be removed in NetBox v3.6.
-
-Any additional arguments to send when invoking the NAPALM driver assigned to this platform.
--- a/docs/plugins/development/navigation.md
+++ b/docs/plugins/development/navigation.md
@@ -64,12 +64,15 @@ item1 = PluginMenuItem(

 A `PluginMenuItem` has the following attributes:

-| Attribute     | Required | Description                                          |
-|---------------|----------|------------------------------------------------------|
-| `link`        | Yes      | Name of the URL path to which this menu item links   |
-| `link_text`   | Yes      | The text presented to the user                       |
-| `permissions` | -        | A list of permissions required to display this link  |
-| `buttons`     | -        | An iterable of PluginMenuButton instances to include |
+| Attribute     | Required | Description                                                                                              |
+|---------------|----------|----------------------------------------------------------------------------------------------------------|
+| `link`        | Yes      | Name of the URL path to which this menu item links                                                       |
+| `link_text`   | Yes      | The text presented to the user                                                                           |
+| `permissions` | -        | A list of permissions required to display this link                                                      |
+| `staff_only`  | -        | Display only for users who have `is_staff` set to true (any specified permissions will also be required) |
+| `buttons`     | -        | An iterable of PluginMenuButton instances to include                                                     |
+
+!!! info "The `staff_only` attribute was introduced in NetBox v3.6.1."

 ## Menu Buttons

--- a/docs/reference/filtering.md
+++ b/docs/reference/filtering.md
@@ -61,13 +61,14 @@ These lookup expressions can be applied by adding a suffix to the desired field'

 Numeric based fields (ASN, VLAN ID, etc) support these lookup expressions:

-| Filter | Description |
-|--------|-------------|
-| `n` | Not equal to |
-| `lt` | Less than |
-| `lte` | Less than or equal to |
-| `gt` | Greater than |
-| `gte` | Greater than or equal to |
+| Filter  | Description              |
+|---------|--------------------------|
+| `n`     | Not equal to             |
+| `lt`    | Less than                |
+| `lte`   | Less than or equal to    |
+| `gt`    | Greater than             |
+| `gte`   | Greater than or equal to |
+| `empty` | Is empty/null (boolean)  |

 Here is an example of a numeric field lookup expression that will return all VLANs with a VLAN ID greater than 900:

@@ -79,18 +80,18 @@ GET /api/ipam/vlans/?vid__gt=900

 String based (char) fields (Name, Address, etc) support these lookup expressions:

-| Filter | Description |
-|--------|-------------|
-| `n` | Not equal to |
-| `ic` | Contains (case-insensitive) |
-| `nic` | Does not contain (case-insensitive) |
-| `isw` | Starts with (case-insensitive) |
-| `nisw` | Does not start with (case-insensitive) |
-| `iew` | Ends with (case-insensitive) |
-| `niew` | Does not end with (case-insensitive) |
-| `ie` | Exact match (case-insensitive) |
-| `nie` | Inverse exact match (case-insensitive) |
-| `empty` | Is empty (boolean) |
+| Filter  | Description                            |
+|---------|----------------------------------------|
+| `n`     | Not equal to                           |
+| `ic`    | Contains (case-insensitive)            |
+| `nic`   | Does not contain (case-insensitive)    |
+| `isw`   | Starts with (case-insensitive)         |
+| `nisw`  | Does not start with (case-insensitive) |
+| `iew`   | Ends with (case-insensitive)           |
+| `niew`  | Does not end with (case-insensitive)   |
+| `ie`    | Exact match (case-insensitive)         |
+| `nie`   | Inverse exact match (case-insensitive) |
+| `empty` | Is empty/null (boolean)                |

 Here is an example of a lookup expression on a string field that will return all devices with `switch` in the name:

--- a/docs/release-notes/index.md
+++ b/docs/release-notes/index.md
@@ -10,6 +10,15 @@ Minor releases are published in April, August, and December of each calendar yea

 This page contains a history of all major and minor releases since NetBox v2.0. For more detail on a specific patch release, please see the release notes page for that specific minor release.

+#### [Version 3.6](./version-3.6.md) (August 2023)
+
+* Relocated Admin UI Views ([#12589](https://github.com/netbox-community/netbox/issues/12589), [#12590](https://github.com/netbox-community/netbox/issues/12590), [#12591](https://github.com/netbox-community/netbox/issues/12591), [#13044](https://github.com/netbox-community/netbox/issues/13044))
+* Configurable Default Permissions ([#13038](https://github.com/netbox-community/netbox/issues/13038))
+* User Bookmarks ([#8248](https://github.com/netbox-community/netbox/issues/8248))
+* Custom Field Choice Sets ([#12988](https://github.com/netbox-community/netbox/issues/12988))
+* Pre-Defined Location Choices for Custom Fields ([#12194](https://github.com/netbox-community/netbox/issues/12194))
+* Restrict Tag Usage by Object Type ([#11541](https://github.com/netbox-community/netbox/issues/11541))
+
 #### [Version 3.5](./version-3.5.md) (April 2023)

 * Customizable Dashboard ([#9416](https://github.com/netbox-community/netbox/issues/9416))
--- a/docs/release-notes/version-3.5.md
+++ b/docs/release-notes/version-3.5.md
@@ -1,6 +1,32 @@
 # NetBox v3.5

-## v3.5.9 (FUTURE)
+## v3.5.9 (2023-08-28)
+
+### Enhancements
+
+* [#12489](https://github.com/netbox-community/netbox/issues/12489) - Dynamically render location and device lists under site and location views
+* [#12825](https://github.com/netbox-community/netbox/issues/12825) - Display assigned values count per obejct type under custom field view
+* [#13313](https://github.com/netbox-community/netbox/issues/13313) - Enable filtering IP ranges by containing prefix
+* [#13415](https://github.com/netbox-community/netbox/issues/13415) - Include request object in custom link renderer on tables
+* [#13536](https://github.com/netbox-community/netbox/issues/13536) - Move child VLANs list to a separate tab under VLAN group view
+* [#13542](https://github.com/netbox-community/netbox/issues/13542) - Pass additional HTTP headers through to custom script context
+* [#13585](https://github.com/netbox-community/netbox/issues/13585) - Introduce `empty` lookup for numeric value filters
+
+### Bug Fixes
+
+* [#11272](https://github.com/netbox-community/netbox/issues/11272) - Fix localization support for device position field
+* [#13358](https://github.com/netbox-community/netbox/issues/13358) - Git backend should send HTTP auth headers only if credentials have been defined
+* [#13477](https://github.com/netbox-community/netbox/issues/13477) - Fix filtering of modified objects after bulk import/update
+* [#13478](https://github.com/netbox-community/netbox/issues/13478) - Fix filtering of export templates by content type under web UI
+* [#13500](https://github.com/netbox-community/netbox/issues/13500) - Fix form validation for bulk update of L2VPN terminations via bulk import form
+* [#13503](https://github.com/netbox-community/netbox/issues/13503) - Fix utilization graph proportions when localization is enabled
+* [#13507](https://github.com/netbox-community/netbox/issues/13507) - Avoid raising exception for invalid content type during global search
+* [#13516](https://github.com/netbox-community/netbox/issues/13516) - Plugin utility functions should be importable from `extras.plugins`
+* [#13530](https://github.com/netbox-community/netbox/issues/13530) - Ensure script log messages can be serialized as JSON data
+* [#13543](https://github.com/netbox-community/netbox/issues/13543) - Config context tab under device/VM view should not require `extras.view_configcontext` permission
+* [#13544](https://github.com/netbox-community/netbox/issues/13544) - Ensure `reindex` command clears all cached values when not in lazy mode
+* [#13556](https://github.com/netbox-community/netbox/issues/13556) - Correct REST API representation of VDC status choice
+* [#13569](https://github.com/netbox-community/netbox/issues/13569) - Fix selection widgets for related interfaces when bulk editing interfaces under device view

 ---

--- a/docs/release-notes/version-3.6.md
+++ b/docs/release-notes/version-3.6.md
@@ -1,34 +1,48 @@
 # NetBox v3.6

-## v3.6-beta2 (2023-08-16)
+## v3.6.1 (2023-09-06)
+
+### Enhancements
+
+* [#12870](https://github.com/netbox-community/netbox/issues/12870) - Support setting token expiration time using the provisioning API endpoint
+* [#13444](https://github.com/netbox-community/netbox/issues/13444) - Add bulk rename functionality to the global device component lists
+* [#13638](https://github.com/netbox-community/netbox/issues/13638) - Add optional `staff_only` attribute to MenuItem

 ### Bug Fixes

-* [#13351](https://github.com/netbox-community/netbox/issues/13351) - Fix missing text due to incorrectly applied translation tags
-* [#13361](https://github.com/netbox-community/netbox/issues/13361) - Extra choices field on custom field choice set form should not be required
-* [#13363](https://github.com/netbox-community/netbox/issues/13363) - Fix API endpoint for custom field choice selector in forms
-* [#13376](https://github.com/netbox-community/netbox/issues/13376) - Restrict add/remove tag fields by model on bulk edit forms
-* [#13410](https://github.com/netbox-community/netbox/issues/13410) - Fix rendering of custom choice fields with large number of choices
-* [#13433](https://github.com/netbox-community/netbox/issues/13433) - User field on API token form should be required
-* [#13434](https://github.com/netbox-community/netbox/issues/13434) - Randomly generate initial keys prior to the creation of new tokens
-* [#13437](https://github.com/netbox-community/netbox/issues/13437) - Display bookmark button only for relevant objects
+* [#12553](https://github.com/netbox-community/netbox/issues/12552) - Ensure `family` attribute is always returned when creating aggregates and prefixes via REST API
+* [#13619](https://github.com/netbox-community/netbox/issues/13619) - Fix exception when viewing IP address assigned to a virtual machine
+* [#13596](https://github.com/netbox-community/netbox/issues/13596) - Always display "render config" tab for devices and virtual machines
+* [#13620](https://github.com/netbox-community/netbox/issues/13620) - Show admin menu items only for staff users
+* [#13622](https://github.com/netbox-community/netbox/issues/13622) - Fix exception when viewing current config and no revisions have been created
+* [#13626](https://github.com/netbox-community/netbox/issues/13626) - Correct filtering of recent activity list under user view
+* [#13628](https://github.com/netbox-community/netbox/issues/13628) - Remove stale references to obsolete NAPALM integration
+* [#13630](https://github.com/netbox-community/netbox/issues/13630) - Fix display of active status under user view
+* [#13632](https://github.com/netbox-community/netbox/issues/13632) - Avoid raising exception when checking if FHRP group IP address is primary
+* [#13642](https://github.com/netbox-community/netbox/issues/13642) - Suppress warning about unreflected model changes when applying migrations
+* [#13657](https://github.com/netbox-community/netbox/issues/13657) - Fix decoding of data file content
+* [#13674](https://github.com/netbox-community/netbox/issues/13674) - Fix retrieving individual report via REST API
+* [#13682](https://github.com/netbox-community/netbox/issues/13682) - Fix error message returned when validation of custom field default value fails
+* [#13684](https://github.com/netbox-community/netbox/issues/13684) - Enable modying the configuration when maintenance mode is enabled

 ---

-## v3.6-beta1 (2023-08-02)
+## v3.6.0 (2023-08-30)

 ### Breaking Changes

 * PostgreSQL 11 is no longer supported (dropped in Django 4.2). NetBox v3.6 requires PostgreSQL 12 or later.
+* The `boto3` and `dulwich` packages are no longer installed automatically. If needed for S3/git remote data backend support, add them to `local_requirements.txt` to ensure their installation.
 * The `device_role` field on the Device model has been renamed to `role`. The `device_role` field has been temporarily retained on the REST API serializer for devices for backward compatibility, but is read-only.
 * The `choices` array field has been removed from the CustomField model. Any defined choices are automatically migrated to CustomFieldChoiceSets, accessible via the new `choice_set` field on the CustomField model.
 * The `napalm_driver` and `napalm_args` fields (which were deprecated in v3.5) have been removed from the Platform model.
+* The `device` and `device_id` filter for interfaces will no longer include interfaces from virtual chassis peers. Two new filters, `virtual_chassis_member` and `virtual_chassis_member_id`, have been introduced to match all interfaces belonging to the specified device's virtual chassis (if any).
 * Reports and scripts are now returned within a `results` list when fetched via the REST API, consistent with other models.
 * Superusers can no longer retrieve API token keys via the web UI if [`ALLOW_TOKEN_RETRIEVAL`](https://docs.netbox.dev/en/stable/configuration/security/#allow_token_retrieval) is disabled. (The admin view has been removed per [#13044](https://github.com/netbox-community/netbox/issues/13044).)

 ### New Features

-#### Relocated Admin Views ([#12589](https://github.com/netbox-community/netbox/issues/12589), [#12590](https://github.com/netbox-community/netbox/issues/12590), [#12591](https://github.com/netbox-community/netbox/issues/12591), [#13044](https://github.com/netbox-community/netbox/issues/13044))
+#### Relocated Admin UI Views ([#12589](https://github.com/netbox-community/netbox/issues/12589), [#12590](https://github.com/netbox-community/netbox/issues/12590), [#12591](https://github.com/netbox-community/netbox/issues/12591), [#13044](https://github.com/netbox-community/netbox/issues/13044))

 Management views for the following object types, previously available only under the backend admin interface, have been relocated to the primary user interface:

@@ -72,6 +86,7 @@ Tags may now be restricted to use with designated object types. Tags that have n
 * [#8137](https://github.com/netbox-community/netbox/issues/8137) - Add a field for designating the out-of-band (OOB) IP address for devices
 * [#10197](https://github.com/netbox-community/netbox/issues/10197) - Cache the number of member devices on each virtual chassis
 * [#11305](https://github.com/netbox-community/netbox/issues/11305) - Add GPS coordinate fields to the device model
+* [#11478](https://github.com/netbox-community/netbox/issues/11478) - Introduce `virtual_chassis_member` filter for interfaces & restore default behavior for `device` filter
 * [#11519](https://github.com/netbox-community/netbox/issues/11519) - Add a SQL index for IP address host values to optimize queries
 * [#11732](https://github.com/netbox-community/netbox/issues/11732) - Prevent inadvertent overwriting of object attributes by competing users
 * [#11936](https://github.com/netbox-community/netbox/issues/11936) - Introduce support for tags and custom fields on webhooks
@@ -84,6 +99,12 @@ Tags may now be restricted to use with designated object types. Tags that have n
 * [#13170](https://github.com/netbox-community/netbox/issues/13170) - Add `rf_role` to InterfaceTemplate
 * [#13269](https://github.com/netbox-community/netbox/issues/13269) - Cache the number of assigned component templates for device types

+### Bug Fixes
+
+* [#13513](https://github.com/netbox-community/netbox/issues/13513) - Prevent exception when rendering bookmarks widget for anonymous user
+* [#13599](https://github.com/netbox-community/netbox/issues/13599) - Fix errant counter increments when editing device/VM components
+* [#13605](https://github.com/netbox-community/netbox/issues/13605) - Optimize cached counter migrations to avoid excessive memory consumption
+
 ### Other Changes

 * Work has begun on introducing translation and localization support in NetBox. This work is being performed in preparation for release 4.0.
@@ -92,8 +113,9 @@ Tags may now be restricted to use with designated object types. Tags that have n
 * [#11766](https://github.com/netbox-community/netbox/issues/11766) - Remove obsolete custom `ChoiceField` and `MultipleChoiceField` classes
 * [#12180](https://github.com/netbox-community/netbox/issues/12180) - All API endpoints for available objects (e.g. IP addresses) now inherit from a common parent view
 * [#12237](https://github.com/netbox-community/netbox/issues/12237) - Upgrade Django to v4.2
-* [#12794](https://github.com/netbox-community/netbox/issues/12794) - Avoid direct imports of Django's stock user model
 * [#12320](https://github.com/netbox-community/netbox/issues/12320) - Remove obsolete fields `napalm_driver` and `napalm_args` from Platform
+* [#12794](https://github.com/netbox-community/netbox/issues/12794) - Avoid direct imports of Django's stock user model
+* [#12906](https://github.com/netbox-community/netbox/issues/12906) - The `boto3` (AWS) and `dulwich` (git) packages for remote data sources are now optional requirements
 * [#12964](https://github.com/netbox-community/netbox/issues/12964) - Drop support for PostgreSQL 11
 * [#13309](https://github.com/netbox-community/netbox/issues/13309) - User account-specific resources have been moved to a new `account` app for better organization

--- a/netbox/core/apps.py
+++ b/netbox/core/apps.py
@@ -1,4 +1,15 @@
 from django.apps import AppConfig
+from django.db import models
+from django.db.migrations.operations import AlterModelOptions
+
+from utilities.migration import custom_deconstruct
+
+# Ignore verbose_name & verbose_name_plural Meta options when calculating model migrations
+AlterModelOptions.ALTER_OPTION_KEYS.remove('verbose_name')
+AlterModelOptions.ALTER_OPTION_KEYS.remove('verbose_name_plural')
+
+# Use our custom destructor to ignore certain attributes when calculating field migrations
+models.Field.deconstruct = custom_deconstruct


 class CoreConfig(AppConfig):
--- a/netbox/core/data_backends.py
+++ b/netbox/core/data_backends.py
@@ -125,12 +125,13 @@ class GitBackend(DataBackend):
        }

        if self.url_scheme in ('http', 'https'):
-            clone_args.update(
-                {
-                    "username": self.params.get('username'),
-                    "password": self.params.get('password'),
-                }
-            )
+            if self.params.get('username'):
+                clone_args.update(
+                    {
+                        "username": self.params.get('username'),
+                        "password": self.params.get('password'),
+                    }
+                )

        logger.debug(f"Cloning git repo: {self.url}")
        try:
--- a/netbox/core/management/commands/makemigrations.py
+++ b/netbox/core/management/commands/makemigrations.py
@@ -1,18 +1,6 @@
-# noinspection PyUnresolvedReferences
 from django.conf import settings
 from django.core.management.base import CommandError
 from django.core.management.commands.makemigrations import Command as _Command
-from django.db import models
-from django.db.migrations.operations import AlterModelOptions
-
-from utilities.migration import custom_deconstruct
-
-# Monkey patch AlterModelOptions to ignore verbose name attributes
-AlterModelOptions.ALTER_OPTION_KEYS.remove('verbose_name')
-AlterModelOptions.ALTER_OPTION_KEYS.remove('verbose_name_plural')
-
-# Set our custom deconstructor for fields
-models.Field.deconstruct = custom_deconstruct


 class Command(_Command):
--- a/netbox/core/management/commands/migrate.py
+++ b/netbox/core/management/commands/migrate.py
@@ -1,7 +0,0 @@
-# noinspection PyUnresolvedReferences
-from django.core.management.commands.migrate import Command
-from django.db import models
-
-from utilities.migration import custom_deconstruct
-
-models.Field.deconstruct = custom_deconstruct
--- a/netbox/core/models/data.py
+++ b/netbox/core/models/data.py
@@ -316,7 +316,7 @@ class DataFile(models.Model):
        if not self.data:
            return None
        try:
-            return bytes(self.data, 'utf-8')
+            return self.data.decode('utf-8')
        except UnicodeDecodeError:
            return None

--- a/netbox/core/urls.py
+++ b/netbox/core/urls.py
@@ -25,4 +25,7 @@ urlpatterns = (
    path('jobs/<int:pk>/', views.JobView.as_view(), name='job'),
    path('jobs/<int:pk>/delete/', views.JobDeleteView.as_view(), name='job_delete'),

+    # Configuration
+    path('config/', views.ConfigView.as_view(), name='config'),
+
 )
--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -1,6 +1,8 @@
 from django.contrib import messages
 from django.shortcuts import get_object_or_404, redirect

+from extras.models import ConfigRevision
+from netbox.config import get_config
 from netbox.views import generic
 from netbox.views.generic.base import BaseObjectView
 from utilities.utils import count_related
@@ -141,3 +143,19 @@ class JobBulkDeleteView(generic.BulkDeleteView):
    queryset = Job.objects.all()
    filterset = filtersets.JobFilterSet
    table = tables.JobTable
+
+
+#
+# Config Revisions
+#
+
+class ConfigView(generic.ObjectView):
+    queryset = ConfigRevision.objects.all()
+
+    def get_object(self, **kwargs):
+        if config := self.queryset.first():
+            return config
+        # Instantiate a dummy default config if none has been created yet
+        return ConfigRevision(
+            data=get_config().defaults
+        )
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -738,12 +738,12 @@ class DeviceWithConfigContextSerializer(DeviceSerializer):
    class Meta(DeviceSerializer.Meta):
        fields = [
            'id', 'url', 'display', 'name', 'device_type', 'role', 'device_role', 'tenant', 'platform', 'serial',
-            'asset_tag', 'site', 'location', 'rack', 'position', 'face', 'parent_device', 'status', 'airflow',
-            'primary_ip', 'primary_ip4', 'primary_ip6', 'oob_ip', 'cluster', 'virtual_chassis', 'vc_position',
-            'vc_priority', 'description', 'comments', 'local_context_data', 'tags', 'custom_fields', 'config_context',
-            'config_template', 'created', 'last_updated', 'console_port_count', 'console_server_port_count',
-            'power_port_count', 'power_outlet_count', 'interface_count', 'front_port_count', 'rear_port_count',
-            'device_bay_count', 'module_bay_count', 'inventory_item_count',
+            'asset_tag', 'site', 'location', 'rack', 'position', 'face', 'latitude', 'longitude', 'parent_device',
+            'status', 'airflow', 'primary_ip', 'primary_ip4', 'primary_ip6', 'oob_ip', 'cluster', 'virtual_chassis',
+            'vc_position', 'vc_priority', 'description', 'comments', 'config_template', 'config_context',
+            'local_context_data', 'tags', 'custom_fields', 'created', 'last_updated', 'console_port_count',
+            'console_server_port_count', 'power_port_count', 'power_outlet_count', 'interface_count',
+            'front_port_count', 'rear_port_count', 'device_bay_count', 'module_bay_count', 'inventory_item_count',
        ]

    @extend_schema_field(serializers.JSONField(allow_null=True))
@@ -758,6 +758,7 @@ class VirtualDeviceContextSerializer(NetBoxModelSerializer):
    primary_ip = NestedIPAddressSerializer(read_only=True, allow_null=True)
    primary_ip4 = NestedIPAddressSerializer(required=False, allow_null=True)
    primary_ip6 = NestedIPAddressSerializer(required=False, allow_null=True)
+    status = ChoiceField(choices=VirtualDeviceContextStatusChoices)

    # Related object counts
    interface_count = serializers.IntegerField(read_only=True)
@@ -786,10 +787,6 @@ class ModuleSerializer(NetBoxModelSerializer):
        ]


-class DeviceNAPALMSerializer(serializers.Serializer):
-    method = serializers.JSONField()
-
-
 #
 # Device components
 #
--- a/netbox/dcim/filtersets.py
+++ b/netbox/dcim/filtersets.py
@@ -1462,17 +1462,15 @@ class InterfaceFilterSet(
    PathEndpointFilterSet,
    CommonInterfaceFilterSet
 ):
-    # Override device and device_id filters from DeviceComponentFilterSet to match against any peer virtual chassis
-    # members
-    device = MultiValueCharFilter(
-        method='filter_device',
+    virtual_chassis_member = MultiValueCharFilter(
+        method='filter_virtual_chassis_member',
        field_name='name',
-        label=_('Device'),
+        label=_('Virtual Chassis Interfaces for Device')
    )
-    device_id = MultiValueNumberFilter(
-        method='filter_device_id',
+    virtual_chassis_member_id = MultiValueNumberFilter(
+        method='filter_virtual_chassis_member',
        field_name='pk',
-        label=_('Device (ID)'),
+        label=_('Virtual Chassis Interfaces for Device (ID)')
    )
    kind = django_filters.CharFilter(
        method='filter_kind',
@@ -1540,23 +1538,11 @@ class InterfaceFilterSet(
            'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'cable_end',
        ]

-    def filter_device(self, queryset, name, value):
+    def filter_virtual_chassis_member(self, queryset, name, value):
        try:
-            devices = Device.objects.filter(**{'{}__in'.format(name): value})
            vc_interface_ids = []
-            for device in devices:
-                vc_interface_ids.extend(device.vc_interfaces().values_list('id', flat=True))
-            return queryset.filter(pk__in=vc_interface_ids)
-        except Device.DoesNotExist:
-            return queryset.none()
-
-    def filter_device_id(self, queryset, name, id_list):
-        # Include interfaces belonging to peer virtual chassis members
-        vc_interface_ids = []
-        try:
-            devices = Device.objects.filter(pk__in=id_list)
-            for device in devices:
-                vc_interface_ids += device.vc_interfaces(if_master=False).values_list('id', flat=True)
+            for device in Device.objects.filter(**{f'{name}__in': value}):
+                vc_interface_ids.extend(device.vc_interfaces(if_master=False).values_list('id', flat=True))
            return queryset.filter(pk__in=vc_interface_ids)
        except Device.DoesNotExist:
            return queryset.none()
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -421,12 +421,13 @@ class DeviceForm(TenancyForm, NetBoxModelForm):
        label=_('Position'),
        required=False,
        help_text=_("The lowest-numbered unit occupied by the device"),
+        localize=True,
        widget=APISelect(
            api_url='/api/dcim/racks/{{rack}}/elevation/',
            attrs={
                'disabled-indicator': 'device',
                'data-dynamic-params': '[{"fieldName":"face","queryParam":"face"}]'
-            }
+            },
        )
    )
    device_type = DynamicModelChoiceField(
@@ -1110,7 +1111,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
        required=False,
        label=_('Parent interface'),
        query_params={
-            'device_id': '$device',
+            'virtual_chassis_member_id': '$device',
        }
    )
    bridge = DynamicModelChoiceField(
@@ -1118,7 +1119,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
        required=False,
        label=_('Bridged interface'),
        query_params={
-            'device_id': '$device',
+            'virtual_chassis_member_id': '$device',
        }
    )
    lag = DynamicModelChoiceField(
@@ -1126,7 +1127,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm):
        required=False,
        label=_('LAG interface'),
        query_params={
-            'device_id': '$device',
+            'virtual_chassis_member_id': '$device',
            'type': 'lag',
        }
    )
--- a/netbox/dcim/migrations/0176_device_component_counters.py
+++ b/netbox/dcim/migrations/0176_device_component_counters.py
@@ -6,7 +6,7 @@ import utilities.fields

 def recalculate_device_counts(apps, schema_editor):
    Device = apps.get_model("dcim", "Device")
-    devices = list(Device.objects.all().annotate(
+    devices = Device.objects.annotate(
        _console_port_count=Count('consoleports', distinct=True),
        _console_server_port_count=Count('consoleserverports', distinct=True),
        _power_port_count=Count('powerports', distinct=True),
@@ -17,7 +17,7 @@ def recalculate_device_counts(apps, schema_editor):
        _device_bay_count=Count('devicebays', distinct=True),
        _module_bay_count=Count('modulebays', distinct=True),
        _inventory_item_count=Count('inventoryitems', distinct=True),
-    ))
+    )

    for device in devices:
        device.console_port_count = device._console_port_count
@@ -42,7 +42,7 @@ def recalculate_device_counts(apps, schema_editor):
        'device_bay_count',
        'module_bay_count',
        'inventory_item_count',
-    ])
+    ], batch_size=100)


 class Migration(migrations.Migration):
--- a/netbox/dcim/migrations/0178_virtual_chassis_member_counter.py
+++ b/netbox/dcim/migrations/0178_virtual_chassis_member_counter.py
@@ -7,12 +7,12 @@ import utilities.fields
 def populate_virtualchassis_members(apps, schema_editor):
    VirtualChassis = apps.get_model('dcim', 'VirtualChassis')

-    vcs = list(VirtualChassis.objects.annotate(_member_count=Count('members', distinct=True)))
+    vcs = VirtualChassis.objects.annotate(_member_count=Count('members', distinct=True))

    for vc in vcs:
        vc.member_count = vc._member_count

-    VirtualChassis.objects.bulk_update(vcs, ['member_count'])
+    VirtualChassis.objects.bulk_update(vcs, ['member_count'], batch_size=100)


 class Migration(migrations.Migration):
--- a/netbox/dcim/tests/test_filtersets.py
+++ b/netbox/dcim/tests/test_filtersets.py
@@ -2822,11 +2822,56 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
        )
        Rack.objects.bulk_create(racks)

+        # VirtualChassis assignment for filtering
+        virtual_chassis = VirtualChassis(name='Virtual Chassis')
+        virtual_chassis.save()
+
        devices = (
-            Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0]),
-            Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1]),
-            Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2]),
-            Device(name=None, device_type=device_types[2], role=roles[2], site=sites[3]),  # For cable connections
+            Device(
+                name='Device 1A',
+                device_type=device_types[0],
+                role=roles[0],
+                site=sites[0],
+                location=locations[0],
+                rack=racks[0],
+                virtual_chassis=virtual_chassis,
+                vc_position=1,
+                vc_priority=1
+            ),
+            Device(
+                name='Device 1B',
+                device_type=device_types[2],
+                role=roles[2],
+                site=sites[2],
+                location=locations[2],
+                rack=racks[2],
+                virtual_chassis=virtual_chassis,
+                vc_position=2,
+                vc_priority=1
+            ),
+            Device(
+                name='Device 2',
+                device_type=device_types[1],
+                role=roles[1],
+                site=sites[1],
+                location=locations[1],
+                rack=racks[1]
+            ),
+            Device(
+                name='Device 3',
+                device_type=device_types[2],
+                role=roles[2],
+                site=sites[2],
+                location=locations[2],
+                rack=racks[2]
+            ),
+            # For cable connections
+            Device(
+                name=None,
+                device_type=device_types[2],
+                role=roles[2],
+                site=sites[3]
+            ),
        )
        Device.objects.bulk_create(devices)

@@ -2834,6 +2879,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
            ModuleBay(device=devices[0], name='Module Bay 1'),
            ModuleBay(device=devices[1], name='Module Bay 2'),
            ModuleBay(device=devices[2], name='Module Bay 3'),
+            ModuleBay(device=devices[3], name='Module Bay 4'),
        )
        ModuleBay.objects.bulk_create(module_bays)

@@ -2841,6 +2887,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
            Module(device=devices[0], module_bay=module_bays[0], module_type=module_type),
            Module(device=devices[1], module_bay=module_bays[1], module_type=module_type),
            Module(device=devices[2], module_bay=module_bays[2], module_type=module_type),
+            Module(device=devices[3], module_bay=module_bays[3], module_type=module_type),
        )
        Module.objects.bulk_create(modules)

@@ -2853,16 +2900,11 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil

        # Virtual Device Context Creation
        vdcs = (
-            VirtualDeviceContext(device=devices[3], name='VDC 1', identifier=1, status=VirtualDeviceContextStatusChoices.STATUS_ACTIVE),
-            VirtualDeviceContext(device=devices[3], name='VDC 2', identifier=2, status=VirtualDeviceContextStatusChoices.STATUS_PLANNED),
+            VirtualDeviceContext(device=devices[4], name='VDC 1', identifier=1, status=VirtualDeviceContextStatusChoices.STATUS_ACTIVE),
+            VirtualDeviceContext(device=devices[4], name='VDC 2', identifier=2, status=VirtualDeviceContextStatusChoices.STATUS_PLANNED),
        )
        VirtualDeviceContext.objects.bulk_create(vdcs)

-        # VirtualChassis assignment for filtering
-        virtual_chassis = VirtualChassis.objects.create(master=devices[0])
-        Device.objects.filter(pk=devices[0].pk).update(virtual_chassis=virtual_chassis, vc_position=1, vc_priority=1)
-        Device.objects.filter(pk=devices[1].pk).update(virtual_chassis=virtual_chassis, vc_position=2, vc_priority=2)
-
        interfaces = (
            Interface(
                device=devices[0],
@@ -2885,6 +2927,13 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
            Interface(
                device=devices[1],
                module=modules[1],
+                name='VC Chassis Interface',
+                type=InterfaceTypeChoices.TYPE_1GE_SFP,
+                enabled=True
+            ),
+            Interface(
+                device=devices[2],
+                module=modules[2],
                name='Interface 2',
                label='B',
                type=InterfaceTypeChoices.TYPE_1GE_GBIC,
@@ -2901,8 +2950,8 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
                poe_type=InterfacePoETypeChoices.TYPE_1_8023AF
            ),
            Interface(
-                device=devices[2],
-                module=modules[2],
+                device=devices[3],
+                module=modules[3],
                name='Interface 3',
                label='C',
                type=InterfaceTypeChoices.TYPE_1GE_FIXED,
@@ -2919,7 +2968,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
                poe_type=InterfacePoETypeChoices.TYPE_2_8023AT
            ),
            Interface(
-                device=devices[3],
+                device=devices[4],
                name='Interface 4',
                label='D',
                type=InterfaceTypeChoices.TYPE_OTHER,
@@ -2932,7 +2981,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
                poe_type=InterfacePoETypeChoices.TYPE_2_8023AT
            ),
            Interface(
-                device=devices[3],
+                device=devices[4],
                name='Interface 5',
                label='E',
                type=InterfaceTypeChoices.TYPE_OTHER,
@@ -2941,7 +2990,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
                tx_power=40
            ),
            Interface(
-                device=devices[3],
+                device=devices[4],
                name='Interface 6',
                label='F',
                type=InterfaceTypeChoices.TYPE_OTHER,
@@ -2950,7 +2999,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
                tx_power=40
            ),
            Interface(
-                device=devices[3],
+                device=devices[4],
                name='Interface 7',
                type=InterfaceTypeChoices.TYPE_80211AC,
                rf_role=WirelessRoleChoices.ROLE_AP,
@@ -2959,7 +3008,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
                rf_channel_width=22
            ),
            Interface(
-                device=devices[3],
+                device=devices[4],
                name='Interface 8',
                type=InterfaceTypeChoices.TYPE_80211AC,
                rf_role=WirelessRoleChoices.ROLE_STATION,
@@ -2977,8 +3026,8 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
        interfaces[7].vdcs.set([vdcs[1]])

        # Cables
-        Cable(a_terminations=[interfaces[0]], b_terminations=[interfaces[3]]).save()
-        Cable(a_terminations=[interfaces[1]], b_terminations=[interfaces[4]]).save()
+        Cable(a_terminations=[interfaces[0]], b_terminations=[interfaces[5]]).save()
+        Cable(a_terminations=[interfaces[1]], b_terminations=[interfaces[6]]).save()
        # Third pair is not connected

    def test_name(self):
@@ -2991,7 +3040,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil

    def test_enabled(self):
        params = {'enabled': 'true'}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 6)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 7)
        params = {'enabled': 'false'}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)

@@ -3011,7 +3060,7 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
        params = {'mgmt_only': 'true'}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
        params = {'mgmt_only': 'false'}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)

    def test_poe_mode(self):
        params = {'poe_mode': [InterfacePoEModeChoices.MODE_PD, InterfacePoEModeChoices.MODE_PSE]}
@@ -3116,6 +3165,14 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
        params = {'device': [devices[0].name, devices[1].name]}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)

+    def test_virtual_chassis_member(self):
+        # Device 1A & 3 have 1 management interface, Device 1B has 1 interfaces
+        devices = Device.objects.filter(name__in=['Device 1A', 'Device 3'])
+        params = {'virtual_chassis_member_id': [devices[0].pk, devices[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+        params = {'virtual_chassis_member': [devices[0].name, devices[1].name]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+
    def test_module(self):
        modules = Module.objects.all()[:2]
        params = {'module_id': [modules[0].pk, modules[1].pk]}
@@ -3125,23 +3182,23 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil
        params = {'cabled': True}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
        params = {'cabled': False}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)

    def test_occupied(self):
        params = {'occupied': True}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
        params = {'occupied': False}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)

    def test_connected(self):
        params = {'connected': True}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
        params = {'connected': False}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)

    def test_kind(self):
        params = {'kind': 'physical'}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 6)
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 7)
        params = {'kind': 'virtual'}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0)

--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -398,32 +398,8 @@ class SiteView(generic.ObjectView):
            (Circuit.objects.restrict(request.user, 'view').filter(terminations__site=instance).distinct(), 'site_id'),
        )

-        locations = Location.objects.add_related_count(
-            Location.objects.all(),
-            Rack,
-            'location',
-            'rack_count',
-            cumulative=True
-        )
-        locations = Location.objects.add_related_count(
-            locations,
-            Device,
-            'location',
-            'device_count',
-            cumulative=True
-        ).restrict(request.user, 'view').filter(site=instance)
-
-        nonracked_devices = Device.objects.filter(
-            site=instance,
-            rack__isnull=True,
-            parent_bay__isnull=True
-        ).prefetch_related('device_type__manufacturer', 'parent_bay', 'role')
-
        return {
            'related_models': related_models,
-            'locations': locations,
-            'nonracked_devices': nonracked_devices.order_by('-pk')[:10],
-            'total_nonracked_devices_count': nonracked_devices.count(),
        }


@@ -495,16 +471,8 @@ class LocationView(generic.ObjectView):
            (Device.objects.restrict(request.user, 'view').filter(location__in=locations), 'location_id'),
        )

-        nonracked_devices = Device.objects.filter(
-            location=instance,
-            rack__isnull=True,
-            parent_bay__isnull=True
-        ).prefetch_related('device_type__manufacturer', 'parent_bay', 'role')
-
        return {
            'related_models': related_models,
-            'nonracked_devices': nonracked_devices.order_by('-pk')[:10],
-            'total_nonracked_devices_count': nonracked_devices.count(),
        }


@@ -2055,7 +2023,6 @@ class DeviceConfigContextView(ObjectConfigContextView):
    base_template = 'dcim/device/base.html'
    tab = ViewTab(
        label=_('Config Context'),
-        permission='extras.view_configcontext',
        weight=2000
    )

@@ -2066,7 +2033,6 @@ class DeviceRenderConfigView(generic.ObjectView):
    template_name = 'dcim/device/render_config.html'
    tab = ViewTab(
        label=_('Render Config'),
-        permission='extras.view_configtemplate',
        weight=2100
    )

@@ -2218,6 +2184,15 @@ class ConsolePortListView(generic.ObjectListView):
    filterset = filtersets.ConsolePortFilterSet
    filterset_form = forms.ConsolePortFilterForm
    table = tables.ConsolePortTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(ConsolePort)
@@ -2281,6 +2256,15 @@ class ConsoleServerPortListView(generic.ObjectListView):
    filterset = filtersets.ConsoleServerPortFilterSet
    filterset_form = forms.ConsoleServerPortFilterForm
    table = tables.ConsoleServerPortTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(ConsoleServerPort)
@@ -2344,6 +2328,15 @@ class PowerPortListView(generic.ObjectListView):
    filterset = filtersets.PowerPortFilterSet
    filterset_form = forms.PowerPortFilterForm
    table = tables.PowerPortTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(PowerPort)
@@ -2407,6 +2400,15 @@ class PowerOutletListView(generic.ObjectListView):
    filterset = filtersets.PowerOutletFilterSet
    filterset_form = forms.PowerOutletFilterForm
    table = tables.PowerOutletTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(PowerOutlet)
@@ -2470,6 +2472,15 @@ class InterfaceListView(generic.ObjectListView):
    filterset = filtersets.InterfaceFilterSet
    filterset_form = forms.InterfaceFilterForm
    table = tables.InterfaceTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(Interface)
@@ -2581,6 +2592,15 @@ class FrontPortListView(generic.ObjectListView):
    filterset = filtersets.FrontPortFilterSet
    filterset_form = forms.FrontPortFilterForm
    table = tables.FrontPortTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(FrontPort)
@@ -2644,6 +2664,15 @@ class RearPortListView(generic.ObjectListView):
    filterset = filtersets.RearPortFilterSet
    filterset_form = forms.RearPortFilterForm
    table = tables.RearPortTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(RearPort)
@@ -2707,6 +2736,15 @@ class ModuleBayListView(generic.ObjectListView):
    filterset = filtersets.ModuleBayFilterSet
    filterset_form = forms.ModuleBayFilterForm
    table = tables.ModuleBayTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(ModuleBay)
@@ -2762,6 +2800,15 @@ class DeviceBayListView(generic.ObjectListView):
    filterset = filtersets.DeviceBayFilterSet
    filterset_form = forms.DeviceBayFilterForm
    table = tables.DeviceBayTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(DeviceBay)
@@ -2886,6 +2933,15 @@ class InventoryItemListView(generic.ObjectListView):
    filterset = filtersets.InventoryItemFilterSet
    filterset_form = forms.InventoryItemFilterForm
    table = tables.InventoryItemTable
+    template_name = 'dcim/component_list.html'
+    actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename')
+    action_perms = defaultdict(set, **{
+        'add': {'add'},
+        'import': {'add'},
+        'bulk_edit': {'change'},
+        'bulk_delete': {'delete'},
+        'bulk_rename': {'change'},
+    })


@register_model_view(InventoryItem)
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -479,7 +479,7 @@ class ReportSerializer(serializers.Serializer):
    module = serializers.CharField(max_length=255)
    name = serializers.CharField(max_length=255)
    description = serializers.CharField(max_length=255, required=False)
-    test_methods = serializers.ListField(child=serializers.CharField(max_length=255))
+    test_methods = serializers.ListField(child=serializers.CharField(max_length=255), read_only=True)
    result = NestedJobSerializer()
    display = serializers.SerializerMethodField(read_only=True)

--- a/netbox/extras/dashboard/widgets.py
+++ b/netbox/extras/dashboard/widgets.py
@@ -346,13 +346,16 @@ class BookmarksWidget(DashboardWidget):
    def render(self, request):
        from extras.models import Bookmark

-        bookmarks = Bookmark.objects.filter(user=request.user).order_by(self.config['order_by'])
-        if object_types := self.config.get('object_types'):
-            models = get_models_from_content_types(object_types)
-            conent_types = ContentType.objects.get_for_models(*models).values()
-            bookmarks = bookmarks.filter(object_type__in=conent_types)
-        if max_items := self.config.get('max_items'):
-            bookmarks = bookmarks[:max_items]
+        if request.user.is_anonymous:
+            bookmarks = list()
+        else:
+            bookmarks = Bookmark.objects.filter(user=request.user).order_by(self.config['order_by'])
+            if object_types := self.config.get('object_types'):
+                models = get_models_from_content_types(object_types)
+                conent_types = ContentType.objects.get_for_models(*models).values()
+                bookmarks = bookmarks.filter(object_type__in=conent_types)
+            if max_items := self.config.get('max_items'):
+                bookmarks = bookmarks[:max_items]

        return render_to_string(self.template_name, {
            'bookmarks': bookmarks,
--- a/netbox/extras/forms/filtersets.py
+++ b/netbox/extras/forms/filtersets.py
@@ -136,7 +136,7 @@ class ExportTemplateFilterForm(SavedFiltersMixin, FilterForm):
    fieldsets = (
        (None, ('q', 'filter_id')),
        (_('Data'), ('data_source_id', 'data_file_id')),
-        (_('Attributes'), ('content_types', 'mime_type', 'file_extension', 'as_attachment')),
+        (_('Attributes'), ('content_type_id', 'mime_type', 'file_extension', 'as_attachment')),
    )
    data_source_id = DynamicModelMultipleChoiceField(
        queryset=DataSource.objects.all(),
@@ -151,10 +151,10 @@ class ExportTemplateFilterForm(SavedFiltersMixin, FilterForm):
            'source_id': '$data_source_id'
        }
    )
-    content_types = ContentTypeMultipleChoiceField(
-        label=_('Content types'),
+    content_type_id = ContentTypeMultipleChoiceField(
        queryset=ContentType.objects.filter(FeatureQuery('export_templates').get_query()),
-        required=False
+        required=False,
+        label=_('Content types')
    )
    mime_type = forms.CharField(
        required=False,
--- a/netbox/extras/forms/model_forms.py
+++ b/netbox/extras/forms/model_forms.py
@@ -490,7 +490,9 @@ class ConfigRevisionForm(BootstrapMixin, forms.ModelForm, metaclass=ConfigFormMe
        (_('Pagination'), ('PAGINATE_COUNT', 'MAX_PAGE_SIZE')),
        (_('Validation'), ('CUSTOM_VALIDATORS',)),
        (_('User Preferences'), ('DEFAULT_USER_PREFERENCES',)),
-        (_('Miscellaneous'), ('MAINTENANCE_MODE', 'GRAPHQL_ENABLED', 'CHANGELOG_RETENTION', 'JOB_RETENTION', 'MAPS_URL')),
+        (_('Miscellaneous'), (
+            'MAINTENANCE_MODE', 'GRAPHQL_ENABLED', 'CHANGELOG_RETENTION', 'JOB_RETENTION', 'MAPS_URL',
+        )),
        (_('Config Revision'), ('comment',))
    )

@@ -524,6 +526,8 @@ class ConfigRevisionForm(BootstrapMixin, forms.ModelForm, metaclass=ConfigFormMe
                elif value == param.default:
                    help_text += _(' (default)')
                self.fields[param.name].help_text = help_text
+                if type(value) in (tuple, list):
+                    value = ', '.join(value)
                self.fields[param.name].initial = value
            if is_static:
                self.fields[param.name].disabled = True
--- a/netbox/extras/management/commands/reindex.py
+++ b/netbox/extras/management/commands/reindex.py
@@ -69,10 +69,7 @@ class Command(BaseCommand):
        if not kwargs['lazy']:
            self.stdout.write('Clearing cached values... ', ending='')
            self.stdout.flush()
-            content_types = [
-                ContentType.objects.get_for_model(model) for model in indexers.keys()
-            ]
-            deleted_count = search_backend.clear(content_types)
+            deleted_count = search_backend.clear()
            self.stdout.write(f'{deleted_count} entries deleted.')

        # Index models
--- a/netbox/extras/models/customfields.py
+++ b/netbox/extras/models/customfields.py
@@ -282,7 +282,7 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
                raise ValidationError({
                    'default': _(
                        'Invalid default value "{default}": {message}'
-                    ).format(default=self.default, message=self.message)
+                    ).format(default=self.default, message=err.message)
                })

        # Minimum/maximum values can be set only for numeric fields
@@ -317,14 +317,6 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
                'choice_set': _("Choices may be set only on selection fields.")
            })

-        # A selection field's default (if any) must be present in its available choices
-        if self.type == CustomFieldTypeChoices.TYPE_SELECT and self.default and self.default not in self.choices:
-            raise ValidationError({
-                'default': _(
-                    "The specified default value ({default}) is not listed as an available choice."
-                ).format(default=self.default)
-            })
-
        # Object fields must define an object_type; other fields must not
        if self.type in (CustomFieldTypeChoices.TYPE_OBJECT, CustomFieldTypeChoices.TYPE_MULTIOBJECT):
            if not self.object_type:
@@ -650,19 +642,22 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):

            # Validate selected choice
            elif self.type == CustomFieldTypeChoices.TYPE_SELECT:
-                if value not in [c[0] for c in self.choices]:
+                if value not in self.choice_set.values:
                    raise ValidationError(
-                        _("Invalid choice ({value}). Available choices are: {choices}").format(
-                            value=value, choices=', '.join(self.choices)
+                        _("Invalid choice ({value}) for choice set {choiceset}.").format(
+                            value=value,
+                            choiceset=self.choice_set
                        )
                    )

            # Validate all selected choices
            elif self.type == CustomFieldTypeChoices.TYPE_MULTISELECT:
-                if not set(value).issubset([c[0] for c in self.choices]):
+                if not set(value).issubset(self.choice_set.values):
                    raise ValidationError(
-                        _("Invalid choice(s) ({invalid_choices}). Available choices are: {available_choices}").format(
-                            invalid_choices=', '.join(value), available_choices=', '.join(self.choices))
+                        _("Invalid choice(s) ({value}) for choice set {choiceset}.").format(
+                            value=value,
+                            choiceset=self.choice_set
+                        )
                    )

            # Validate selected object
@@ -747,6 +742,13 @@ class CustomFieldChoiceSet(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel
    def choices_count(self):
        return len(self.choices)

+    @property
+    def values(self):
+        """
+        Returns an iterator of the valid choice values.
+        """
+        return (x[0] for x in self.choices)
+
    def clean(self):
        if not self.base_choices and not self.extra_choices:
            raise ValidationError(_("Must define base or extra choices."))
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -1,7 +1,6 @@
 import json
 import urllib.parse

-from django.contrib import admin
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
@@ -12,7 +11,7 @@ from django.http import HttpResponse
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.formats import date_format
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext, gettext_lazy as _
 from rest_framework.utils.encoders import JSONEncoder

 from extras.choices import *
@@ -724,7 +723,11 @@ class ConfigRevision(models.Model):
        verbose_name_plural = _('config revisions')

    def __str__(self):
-        return f'Config revision #{self.pk} ({self.created})'
+        if not self.pk:
+            return gettext('Default configuration')
+        if self.is_active:
+            return gettext('Current configuration')
+        return gettext('Config revision #{id}').format(id=self.pk)

    def __getattr__(self, item):
        if item in self.data:
@@ -732,6 +735,8 @@ class ConfigRevision(models.Model):
        return super().__getattribute__(item)

    def get_absolute_url(self):
+        if not self.pk:
+            return reverse('core:config')  # Default config view
        return reverse('extras:configrevision', args=[self.pk])

    def activate(self):
@@ -742,6 +747,6 @@ class ConfigRevision(models.Model):
        cache.set('config_version', self.pk, None)
    activate.alters_data = True

-    @admin.display(boolean=True)
+    @property
    def is_active(self):
        return cache.get('config_version') == self.pk
--- a/netbox/extras/plugins/init.py
+++ b/netbox/extras/plugins/init.py
@@ -11,6 +11,7 @@ from netbox.search import register_search
 from .navigation import *
 from .registration import *
 from .templates import *
+from .utils import *

 # Initialize plugin registry
 registry['plugins'].update({
--- a/netbox/extras/plugins/navigation.py
+++ b/netbox/extras/plugins/navigation.py
@@ -36,9 +36,10 @@ class PluginMenuItem:
    permissions = []
    buttons = []

-    def __init__(self, link, link_text, permissions=None, buttons=None):
+    def __init__(self, link, link_text, staff_only=False, permissions=None, buttons=None):
        self.link = link
        self.link_text = link_text
+        self.staff_only = staff_only
        if permissions is not None:
            if type(permissions) not in (list, tuple):
                raise TypeError("Permissions must be passed as a tuple or list.")
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -401,23 +401,23 @@ class BaseScript:

    def log_debug(self, message):
        self.logger.log(logging.DEBUG, message)
-        self.log.append((LogLevelChoices.LOG_DEFAULT, message))
+        self.log.append((LogLevelChoices.LOG_DEFAULT, str(message)))

    def log_success(self, message):
        self.logger.log(logging.INFO, message)  # No syslog equivalent for SUCCESS
-        self.log.append((LogLevelChoices.LOG_SUCCESS, message))
+        self.log.append((LogLevelChoices.LOG_SUCCESS, str(message)))

    def log_info(self, message):
        self.logger.log(logging.INFO, message)
-        self.log.append((LogLevelChoices.LOG_INFO, message))
+        self.log.append((LogLevelChoices.LOG_INFO, str(message)))

    def log_warning(self, message):
        self.logger.log(logging.WARNING, message)
-        self.log.append((LogLevelChoices.LOG_WARNING, message))
+        self.log.append((LogLevelChoices.LOG_WARNING, str(message)))

    def log_failure(self, message):
        self.logger.log(logging.ERROR, message)
-        self.log.append((LogLevelChoices.LOG_FAILURE, message))
+        self.log.append((LogLevelChoices.LOG_FAILURE, str(message)))

    # Convenience functions

--- a/netbox/extras/tests/test_customfields.py
+++ b/netbox/extras/tests/test_customfields.py
@@ -427,6 +427,97 @@ class CustomFieldTest(TestCase):
        self.assertNotIn('field1', site.custom_field_data)
        self.assertEqual(site.custom_field_data['field2'], FIELD_DATA)

+    def test_default_value_validation(self):
+        choiceset = CustomFieldChoiceSet.objects.create(
+            name="Test Choice Set",
+            extra_choices=(
+                ('choice1', 'Choice 1'),
+                ('choice2', 'Choice 2'),
+            )
+        )
+        site = Site.objects.create(name='Site 1', slug='site-1')
+        object_type = ContentType.objects.get_for_model(Site)
+
+        # Text
+        CustomField(name='test', type='text', required=True, default="Default text").full_clean()
+
+        # Integer
+        CustomField(name='test', type='integer', required=True, default=1).full_clean()
+        with self.assertRaises(ValidationError):
+            CustomField(name='test', type='integer', required=True, default='xxx').full_clean()
+
+        # Boolean
+        CustomField(name='test', type='boolean', required=True, default=True).full_clean()
+        with self.assertRaises(ValidationError):
+            CustomField(name='test', type='boolean', required=True, default='xxx').full_clean()
+
+        # Date
+        CustomField(name='test', type='date', required=True, default="2023-02-25").full_clean()
+        with self.assertRaises(ValidationError):
+            CustomField(name='test', type='date', required=True, default='xxx').full_clean()
+
+        # Datetime
+        CustomField(name='test', type='datetime', required=True, default="2023-02-25 02:02:02").full_clean()
+        with self.assertRaises(ValidationError):
+            CustomField(name='test', type='datetime', required=True, default='xxx').full_clean()
+
+        # URL
+        CustomField(name='test', type='url', required=True, default="https://www.netbox.dev").full_clean()
+
+        # JSON
+        CustomField(name='test', type='json', required=True, default='{"test": "object"}').full_clean()
+
+        # Selection
+        CustomField(name='test', type='select', required=True, choice_set=choiceset, default='choice1').full_clean()
+        with self.assertRaises(ValidationError):
+            CustomField(name='test', type='select', required=True, choice_set=choiceset, default='xxx').full_clean()
+
+        # Multi-select
+        CustomField(
+            name='test',
+            type='multiselect',
+            required=True,
+            choice_set=choiceset,
+            default=['choice1']  # Single default choice
+        ).full_clean()
+        CustomField(
+            name='test',
+            type='multiselect',
+            required=True,
+            choice_set=choiceset,
+            default=['choice1', 'choice2']  # Multiple default choices
+        ).full_clean()
+        with self.assertRaises(ValidationError):
+            CustomField(
+                name='test',
+                type='multiselect',
+                required=True,
+                choice_set=choiceset,
+                default=['xxx']
+            ).full_clean()
+
+        # Object
+        CustomField(name='test', type='object', required=True, object_type=object_type, default=site.pk).full_clean()
+        with self.assertRaises(ValidationError):
+            CustomField(name='test', type='object', required=True, object_type=object_type, default="xxx").full_clean()
+
+        # Multi-object
+        CustomField(
+            name='test',
+            type='multiobject',
+            required=True,
+            object_type=object_type,
+            default=[site.pk]
+        ).full_clean()
+        with self.assertRaises(ValidationError):
+            CustomField(
+                name='test',
+                type='multiobject',
+                required=True,
+                object_type=object_type,
+                default=["xxx"]
+            ).full_clean()
+

 class CustomFieldManagerTest(TestCase):

--- a/netbox/extras/tests/test_filtersets.py
+++ b/netbox/extras/tests/test_filtersets.py
@@ -1109,11 +1109,13 @@ class ChangeLoggedFilterSetTestCase(TestCase):
            Site(name='Site 1', slug='site-1'),
            Site(name='Site 2', slug='site-2'),
            Site(name='Site 3', slug='site-3'),
+            Site(name='Site 4', slug='site-4'),
        )
        Site.objects.bulk_create(sites)

        # Simulate *creation* changelog records for two of the sites
        request_id = uuid.uuid4()
+        cls.create_request_id = request_id
        objectchanges = (
            ObjectChange(
                changed_object_type=content_type,
@@ -1132,6 +1134,7 @@ class ChangeLoggedFilterSetTestCase(TestCase):

        # Simulate *update* changelog records for two of the sites
        request_id = uuid.uuid4()
+        cls.update_request_id = request_id
        objectchanges = (
            ObjectChange(
                changed_object_type=content_type,
@@ -1148,14 +1151,36 @@ class ChangeLoggedFilterSetTestCase(TestCase):
        )
        ObjectChange.objects.bulk_create(objectchanges)

+        # Simulate *create* and *update* changelog records for two of the sites
+        request_id = uuid.uuid4()
+        cls.create_update_request_id = request_id
+        objectchanges = (
+            ObjectChange(
+                changed_object_type=content_type,
+                changed_object_id=sites[2].pk,
+                action=ObjectChangeActionChoices.ACTION_CREATE,
+                request_id=request_id
+            ),
+            ObjectChange(
+                changed_object_type=content_type,
+                changed_object_id=sites[3].pk,
+                action=ObjectChangeActionChoices.ACTION_UPDATE,
+                request_id=request_id
+            ),
+        )
+        ObjectChange.objects.bulk_create(objectchanges)
+
    def test_created_by_request(self):
-        request_id = ObjectChange.objects.filter(action=ObjectChangeActionChoices.ACTION_CREATE).first().request_id
-        params = {'created_by_request': request_id}
+        params = {'created_by_request': self.create_request_id}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-        self.assertEqual(self.queryset.count(), 3)
+        self.assertEqual(self.queryset.count(), 4)

    def test_updated_by_request(self):
-        request_id = ObjectChange.objects.filter(action=ObjectChangeActionChoices.ACTION_UPDATE).first().request_id
-        params = {'updated_by_request': request_id}
+        params = {'updated_by_request': self.update_request_id}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-        self.assertEqual(self.queryset.count(), 3)
+        self.assertEqual(self.queryset.count(), 4)
+
+    def test_modified_by_request(self):
+        params = {'modified_by_request': self.create_update_request_id}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        self.assertEqual(self.queryset.count(), 4)
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -46,6 +46,21 @@ class CustomFieldListView(generic.ObjectListView):
 class CustomFieldView(generic.ObjectView):
    queryset = CustomField.objects.select_related('choice_set')

+    def get_extra_context(self, request, instance):
+        related_models = ()
+
+        for content_type in instance.content_types.all():
+            related_models += (
+                content_type.model_class().objects.restrict(request.user, 'view').exclude(
+                    Q(**{f'custom_field_data__{instance.name}': ''}) |
+                    Q(**{f'custom_field_data__{instance.name}': None})
+                ),
+            )
+
+        return {
+            'related_models': related_models
+        }
+

@register_model_view(CustomField, 'edit')
 class CustomFieldEditView(generic.ObjectEditView):
--- a/netbox/ipam/api/field_serializers.py
+++ b/netbox/ipam/api/field_serializers.py
@@ -1,21 +1,18 @@
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers

-from ipam import models
 from netaddr import AddrFormatError, IPNetwork

-__all__ = [
+__all__ = (
    'IPAddressField',
-]
+    'IPNetworkField',
+)


-#
-# IP address field
-#
-
 class IPAddressField(serializers.CharField):
-    """IPAddressField with mask"""
-
+    """
+    An IPv4 or IPv6 address with optional mask
+    """
    default_error_messages = {
        'invalid': _('Enter a valid IPv4 or IPv6 address with optional mask.'),
    }
@@ -24,7 +21,27 @@ class IPAddressField(serializers.CharField):
        try:
            return IPNetwork(data)
        except AddrFormatError:
-            raise serializers.ValidationError("Invalid IP address format: {}".format(data))
+            raise serializers.ValidationError(_("Invalid IP address format: {data}").format(data))
+        except (TypeError, ValueError) as e:
+            raise serializers.ValidationError(e)
+
+    def to_representation(self, value):
+        return str(value)
+
+
+class IPNetworkField(serializers.CharField):
+    """
+    An IPv4 or IPv6 prefix
+    """
+    default_error_messages = {
+        'invalid': _('Enter a valid IPv4 or IPv6 prefix and mask in CIDR notation.'),
+    }
+
+    def to_internal_value(self, data):
+        try:
+            return IPNetwork(data)
+        except AddrFormatError:
+            raise serializers.ValidationError(_("Invalid IP prefix format: {data}").format(data))
        except (TypeError, ValueError) as e:
            raise serializers.ValidationError(e)

--- a/netbox/ipam/api/serializers.py
+++ b/netbox/ipam/api/serializers.py
@@ -13,7 +13,7 @@ from tenancy.api.nested_serializers import NestedTenantSerializer
 from utilities.api import get_serializer_for_model
 from virtualization.api.nested_serializers import NestedVirtualMachineSerializer
 from .nested_serializers import *
-from .field_serializers import IPAddressField
+from .field_serializers import IPAddressField, IPNetworkField


 #
@@ -138,7 +138,7 @@ class AggregateSerializer(NetBoxModelSerializer):
    family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True)
    rir = NestedRIRSerializer()
    tenant = NestedTenantSerializer(required=False, allow_null=True)
-    prefix = serializers.CharField()
+    prefix = IPNetworkField()

    class Meta:
        model = Aggregate
@@ -146,7 +146,6 @@ class AggregateSerializer(NetBoxModelSerializer):
            'id', 'url', 'display', 'family', 'prefix', 'rir', 'tenant', 'date_added', 'description', 'comments',
            'tags', 'custom_fields', 'created', 'last_updated',
        ]
-        read_only_fields = ['family']


 #
@@ -306,7 +305,7 @@ class PrefixSerializer(NetBoxModelSerializer):
    role = NestedRoleSerializer(required=False, allow_null=True)
    children = serializers.IntegerField(read_only=True)
    _depth = serializers.IntegerField(read_only=True)
-    prefix = serializers.CharField()
+    prefix = IPNetworkField()

    class Meta:
        model = Prefix
@@ -315,7 +314,6 @@ class PrefixSerializer(NetBoxModelSerializer):
            'mark_utilized', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'children',
            '_depth',
        ]
-        read_only_fields = ['family']


 class PrefixLengthSerializer(serializers.Serializer):
@@ -386,7 +384,6 @@ class IPRangeSerializer(NetBoxModelSerializer):
            'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
            'mark_utilized', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
        ]
-        read_only_fields = ['family']


 #
--- a/netbox/ipam/filtersets.py
+++ b/netbox/ipam/filtersets.py
@@ -467,6 +467,10 @@ class IPRangeFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
        choices=IPRangeStatusChoices,
        null_value=None
    )
+    parent = MultiValueCharFilter(
+        method='search_by_parent',
+        label=_('Parent prefix'),
+    )

    class Meta:
        model = IPRange
@@ -501,6 +505,18 @@ class IPRangeFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
        except ValidationError:
            return queryset.none()

+    def search_by_parent(self, queryset, name, value):
+        if not value:
+            return queryset
+        q = Q()
+        for prefix in value:
+            try:
+                query = str(netaddr.IPNetwork(prefix.strip()).cidr)
+                q |= Q(start_address__net_host_contained=query, end_address__net_host_contained=query)
+            except (AddrFormatError, ValueError):
+                return queryset.none()
+        return queryset.filter(q)
+

 class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
    family = django_filters.NumberFilter(
--- a/netbox/ipam/forms/bulk_import.py
+++ b/netbox/ipam/forms/bulk_import.py
@@ -592,9 +592,11 @@ class L2VPNTerminationImportForm(NetBoxModelImportForm):

        if self.cleaned_data.get('device') and self.cleaned_data.get('virtual_machine'):
            raise ValidationError(_('Cannot import device and VM interface terminations simultaneously.'))
-        if not (self.cleaned_data.get('interface') or self.cleaned_data.get('vlan')):
+        if not self.instance and not (self.cleaned_data.get('interface') or self.cleaned_data.get('vlan')):
            raise ValidationError(_('Each termination must specify either an interface or a VLAN.'))
        if self.cleaned_data.get('interface') and self.cleaned_data.get('vlan'):
            raise ValidationError(_('Cannot assign both an interface and a VLAN.'))

-        self.instance.assigned_object = self.cleaned_data.get('interface') or self.cleaned_data.get('vlan')
+        # if this is an update we might not have interface or vlan in the form data
+        if self.cleaned_data.get('interface') or self.cleaned_data.get('vlan'):
+            self.instance.assigned_object = self.cleaned_data.get('interface') or self.cleaned_data.get('vlan')
--- a/netbox/ipam/models/ip.py
+++ b/netbox/ipam/models/ip.py
@@ -892,7 +892,7 @@ class IPAddress(PrimaryModel):
    def is_oob_ip(self):
        if self.assigned_object:
            parent = getattr(self.assigned_object, 'parent_object', None)
-            if parent.oob_ip_id == self.pk:
+            if hasattr(parent, 'oob_ip') and parent.oob_ip_id == self.pk:
                return True
        return False

@@ -900,9 +900,9 @@ class IPAddress(PrimaryModel):
    def is_primary_ip(self):
        if self.assigned_object:
            parent = getattr(self.assigned_object, 'parent_object', None)
-            if self.family == 4 and parent.primary_ip4_id == self.pk:
+            if self.family == 4 and hasattr(parent, 'primary_ip4') and parent.primary_ip4_id == self.pk:
                return True
-            if self.family == 6 and parent.primary_ip6_id == self.pk:
+            if self.family == 6 and hasattr(parent, 'primary_ip6') and parent.primary_ip6_id == self.pk:
                return True
        return False

--- a/netbox/ipam/models/vlans.py
+++ b/netbox/ipam/models/vlans.py
@@ -118,6 +118,12 @@ class VLANGroup(OrganizationalModel):
            return available_vids[0]
        return None

+    def get_child_vlans(self):
+        """
+        Return all VLANs within this group.
+        """
+        return VLAN.objects.filter(group=self).order_by('vid')
+

 class VLAN(PrimaryModel):
    """
--- a/netbox/ipam/tests/test_filtersets.py
+++ b/netbox/ipam/tests/test_filtersets.py
@@ -10,7 +10,6 @@ from ipam.models import *
 from utilities.testing import ChangeLoggedFilterSetTests, create_test_device, create_test_virtualmachine
 from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 from tenancy.models import Tenant, TenantGroup
-from rest_framework import serializers


 class ASNRangeTestCase(TestCase, ChangeLoggedFilterSetTests):
@@ -807,6 +806,12 @@ class IPRangeTestCase(TestCase, ChangeLoggedFilterSetTests):
        params = {'description': ['foobar1', 'foobar2']}
        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)

+    def test_parent(self):
+        params = {'parent': ['10.0.1.0/24', '10.0.2.0/24']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {'parent': ['10.0.1.0/25']}  # Range 10.0.1.100-199 is not fully contained by 10.0.1.0/25
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0)
+

 class IPAddressTestCase(TestCase, ChangeLoggedFilterSetTests):
    queryset = IPAddress.objects.all()
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -897,21 +897,8 @@ class VLANGroupView(generic.ObjectView):
            (VLAN.objects.restrict(request.user, 'view').filter(group=instance), 'group_id'),
        )

-        # TODO: Replace with embedded table
-        vlans = VLAN.objects.restrict(request.user, 'view').filter(group=instance).prefetch_related(
-            Prefetch('prefixes', queryset=Prefix.objects.restrict(request.user)),
-            'tenant', 'site', 'role',
-        ).order_by('vid')
-        vlans = add_available_vlans(vlans, vlan_group=instance)
-
-        vlans_table = tables.VLANTable(vlans, user=request.user, exclude=('group',))
-        if request.user.has_perm('ipam.change_vlan') or request.user.has_perm('ipam.delete_vlan'):
-            vlans_table.columns.show('pk')
-        vlans_table.configure(request)
-
        return {
            'related_models': related_models,
-            'vlans_table': vlans_table,
        }


@@ -944,6 +931,30 @@ class VLANGroupBulkDeleteView(generic.BulkDeleteView):
    table = tables.VLANGroupTable


+@register_model_view(VLANGroup, 'vlans')
+class VLANGroupVLANsView(generic.ObjectChildrenView):
+    queryset = VLANGroup.objects.all()
+    child_model = VLAN
+    table = tables.VLANTable
+    filterset = filtersets.VLANFilterSet
+    template_name = 'generic/object_children.html'
+    tab = ViewTab(
+        label=_('VLANs'),
+        badge=lambda x: x.get_child_vlans().count(),
+        permission='ipam.view_vlan',
+        weight=500
+    )
+
+    def get_children(self, request, parent):
+        return parent.get_child_vlans().restrict(request.user, 'view').prefetch_related(
+            Prefetch('prefixes', queryset=Prefix.objects.restrict(request.user)),
+            'tenant', 'site', 'role',
+        )
+
+    def prep_table_data(self, request, queryset, parent):
+        return add_available_vlans(parent.get_child_vlans(), parent)
+
+
 #
 # FHRP groups
 #
--- a/netbox/netbox/config/parameters.py
+++ b/netbox/netbox/config/parameters.py
@@ -102,7 +102,6 @@ PARAMS = (
        description=_("Default voltage for powerfeeds"),
        field=forms.IntegerField
    ),
-
    ConfigParam(
        name='POWERFEED_DEFAULT_AMPERAGE',
        label=_('Powerfeed amperage'),
@@ -110,7 +109,6 @@ PARAMS = (
        description=_("Default amperage for powerfeeds"),
        field=forms.IntegerField
    ),
-
    ConfigParam(
        name='POWERFEED_DEFAULT_MAX_UTILIZATION',
        label=_('Powerfeed max utilization'),
@@ -160,39 +158,6 @@ PARAMS = (
        },
    ),

-    # NAPALM
-    ConfigParam(
-        name='NAPALM_USERNAME',
-        label=_('NAPALM username'),
-        default='',
-        description=_("Username to use when connecting to devices via NAPALM")
-    ),
-    ConfigParam(
-        name='NAPALM_PASSWORD',
-        label=_('NAPALM password'),
-        default='',
-        description=_("Password to use when connecting to devices via NAPALM")
-    ),
-    ConfigParam(
-        name='NAPALM_TIMEOUT',
-        label=_('NAPALM timeout'),
-        default=30,
-        description=_("NAPALM connection timeout (in seconds)"),
-        field=forms.IntegerField
-    ),
-    ConfigParam(
-        name='NAPALM_ARGS',
-        label=_('NAPALM arguments'),
-        default={},
-        description=_("Additional arguments to pass when invoking a NAPALM driver (as JSON data)"),
-        field=forms.JSONField,
-        field_kwargs={
-            'widget': forms.Textarea(
-                attrs={'class': 'vLargeTextField'}
-            ),
-        },
-    ),
-
    # User preferences
    ConfigParam(
        name='DEFAULT_USER_PREFERENCES',
--- a/netbox/netbox/filtersets.py
+++ b/netbox/netbox/filtersets.py
@@ -246,18 +246,22 @@ class ChangeLoggedModelFilterSet(BaseFilterSet):
    updated_by_request = django_filters.UUIDFilter(
        method='filter_by_request'
    )
+    modified_by_request = django_filters.UUIDFilter(
+        method='filter_by_request'
+    )

    def filter_by_request(self, queryset, name, value):
        content_type = ContentType.objects.get_for_model(self.Meta.model)
        action = {
-            'created_by_request': ObjectChangeActionChoices.ACTION_CREATE,
-            'updated_by_request': ObjectChangeActionChoices.ACTION_UPDATE,
+            'created_by_request': Q(action=ObjectChangeActionChoices.ACTION_CREATE),
+            'updated_by_request': Q(action=ObjectChangeActionChoices.ACTION_UPDATE),
+            'modified_by_request': Q(action__in=[ObjectChangeActionChoices.ACTION_CREATE, ObjectChangeActionChoices.ACTION_UPDATE]),
        }.get(name)
        request_id = value
        pks = ObjectChange.objects.filter(
+            action,
            changed_object_type=content_type,
-            action=action,
-            request_id=request_id
+            request_id=request_id,
        ).values_list('changed_object_id', flat=True)
        return queryset.filter(pk__in=pks)

--- a/netbox/netbox/navigation/init.py
+++ b/netbox/netbox/navigation/init.py
@@ -34,6 +34,7 @@ class MenuItem:
    link: str
    link_text: str
    permissions: Optional[Sequence[str]] = ()
+    staff_only: Optional[bool] = False
    buttons: Optional[Sequence[MenuItemButton]] = ()


--- a/netbox/netbox/navigation/menu.py
+++ b/netbox/netbox/navigation/menu.py
@@ -360,6 +360,7 @@ ADMIN_MENU = Menu(
                    link=f'users:netboxuser_list',
                    link_text=_('Users'),
                    permissions=[f'auth.view_user'],
+                    staff_only=True,
                    buttons=(
                        MenuItemButton(
                            link=f'users:netboxuser_add',
@@ -382,6 +383,7 @@ ADMIN_MENU = Menu(
                    link=f'users:netboxgroup_list',
                    link_text=_('Groups'),
                    permissions=[f'auth.view_group'],
+                    staff_only=True,
                    buttons=(
                        MenuItemButton(
                            link=f'users:netboxgroup_add',
@@ -399,17 +401,36 @@ ADMIN_MENU = Menu(
                        )
                    )
                ),
-                get_model_item('users', 'token', _('API Tokens')),
-                get_model_item('users', 'objectpermission', _('Permissions'), actions=['add']),
+                MenuItem(
+                    link=f'users:token_list',
+                    link_text=_('API Tokens'),
+                    permissions=[f'users.view_token'],
+                    staff_only=True,
+                    buttons=get_model_buttons('users', 'token')
+                ),
+                MenuItem(
+                    link=f'users:objectpermission_list',
+                    link_text=_('Permissions'),
+                    permissions=[f'users.view_objectpermission'],
+                    staff_only=True,
+                    buttons=get_model_buttons('users', 'objectpermission', actions=['add'])
+                ),
            ),
        ),
        MenuGroup(
            label=_('Configuration'),
            items=(
+                MenuItem(
+                    link='core:config',
+                    link_text=_('Current Config'),
+                    permissions=['extras.view_configrevision'],
+                    staff_only=True
+                ),
                MenuItem(
                    link='extras:configrevision_list',
                    link_text=_('Config Revisions'),
-                    permissions=['extras.view_configrevision']
+                    permissions=['extras.view_configrevision'],
+                    staff_only=True
                ),
            ),
        ),
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -25,7 +25,7 @@ from netbox.constants import RQ_QUEUE_DEFAULT, RQ_QUEUE_HIGH, RQ_QUEUE_LOW
 # Environment setup
 #

-VERSION = '3.6-beta2'
+VERSION = '3.6.1'

 # Hostname
 HOSTNAME = platform.node()
@@ -496,6 +496,7 @@ AUTH_EXEMPT_PATHS = (
 # All URLs starting with a string listed here are exempt from maintenance mode enforcement
 MAINTENANCE_EXEMPT_PATHS = (
    f'/{BASE_PATH}admin/',
+    f'/{BASE_PATH}extras/config-revisions/',  # Allow modifying the configuration
 )

 SERIALIZATION_MODULES = {
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -4,6 +4,7 @@ from urllib.parse import quote

 import django_tables2 as tables
 from django.conf import settings
+from django.contrib.auth.context_processors import auth
 from django.contrib.auth.models import AnonymousUser
 from django.db.models import DateField, DateTimeField
 from django.template import Context, Template
@@ -517,24 +518,32 @@ class CustomLinkColumn(tables.Column):

        super().__init__(*args, **kwargs)

-    def render(self, record):
-        try:
-            rendered = self.customlink.render({
-                'object': record,
+    def _render_customlink(self, record, table):
+        context = {
+            'object': record,
+            'debug': settings.DEBUG,
+        }
+        if request := getattr(table, 'context', {}).get('request'):
+            # If the request is available, include it as context
+            context.update({
+                'request': request,
+                **auth(request),
            })
-            if rendered:
+
+        return self.customlink.render(context)
+
+    def render(self, record, table, **kwargs):
+        try:
+            if rendered := self._render_customlink(record, table):
                return mark_safe(f'<a href="{rendered["link"]}"{rendered["link_target"]}>{rendered["text"]}</a>')
        except Exception as e:
            error_text = _('Error')
            return mark_safe(f'<span class="text-danger" title="{e}"><i class="mdi mdi-alert"></i> {error_text}</span>')
        return ''

-    def value(self, record):
+    def value(self, record, table, **kwargs):
        try:
-            rendered = self.customlink.render({
-                'object': record,
-            })
-            if rendered:
+            if rendered := self._render_customlink(record, table):
                return rendered['link']
        except Exception:
            pass
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -465,7 +465,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
                    messages.success(request, msg)

                    view_name = get_viewname(model, action='list')
-                    results_url = f"{reverse(view_name)}?created_by_request={request.id}"
+                    results_url = f"{reverse(view_name)}?modified_by_request={request.id}"
                    return redirect(results_url)

            except (AbortTransaction, ValidationError):
--- a/netbox/project-static/dist/graphiql.css
+++ b/netbox/project-static/dist/graphiql.css
--- a/netbox/project-static/dist/graphiql.js
+++ b/netbox/project-static/dist/graphiql.js
--- a/netbox/project-static/dist/graphiql.js.map
+++ b/netbox/project-static/dist/graphiql.js.map
--- a/netbox/project-static/netbox-graphiql/package.json
+++ b/netbox/project-static/netbox-graphiql/package.json
@@ -6,7 +6,7 @@
  "license": "Apache-2.0",
  "private": true,
  "dependencies": {
-    "graphiql": "1.4.1",
+    "graphiql": "1.8.9",
    "graphql": ">= v14.5.0 <= 15.5.0",
    "react": "17.0.2",
    "react-dom": "17.0.2",
--- a/netbox/project-static/yarn.lock
+++ b/netbox/project-static/yarn.lock
--- a/netbox/templates/dcim/component_list.html
+++ b/netbox/templates/dcim/component_list.html
@@ -0,0 +1,22 @@
+{% extends 'generic/object_list.html' %}
+{% load buttons %}
+{% load helpers %}
+{% load i18n %}
+
+{% block bulk_buttons %}
+  <div class="btn-group" role="group">
+    {% if 'bulk_edit' in actions %}
+      {% bulk_edit_button model query_params=request.GET %}
+    {% endif %}
+    {% if 'bulk_rename' in actions %}
+      {% with bulk_rename_view=model|validated_viewname:"bulk_rename" %}
+        <button type="submit" name="_rename" formaction="{% url bulk_rename_view %}" class="btn btn-outline-warning btn-sm">
+          <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename Selected" %}
+        </button>
+      {% endwith %}
+    {% endif %}
+  </div>
+  {% if 'bulk_delete' in actions %}
+    {% bulk_delete_button model query_params=request.GET %}
+  {% endif %}
+{% endblock %}
--- a/netbox/templates/dcim/device/components_base.html
+++ b/netbox/templates/dcim/device/components_base.html
@@ -2,7 +2,15 @@
 {% load helpers %}

 {% block bulk_edit_controls %}
-    {{ block.super }}
+    {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %}
+        {% if 'bulk_edit' in actions and bulk_edit_view %}
+            <button type="submit" name="_edit"
+                    formaction="{% url bulk_edit_view %}?device={{ object.pk }}&return_url={{ return_url }}"
+                    class="btn btn-warning btn-sm">
+                <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
+            </button>
+        {% endif %}
+    {% endwith %}
    {% with bulk_rename_view=child_model|validated_viewname:"bulk_rename" %}
        {% if 'bulk_rename' in actions and bulk_rename_view %}
            <button type="submit" name="_rename"
--- a/netbox/templates/dcim/inc/nonracked_devices.html
+++ b/netbox/templates/dcim/inc/nonracked_devices.html
@@ -1,83 +0,0 @@
-{% load helpers %}
-{% load i18n %}
-
-<div class="card">
-    <h5 class="card-header">
-        {% trans "Non-Racked Devices" %}
-    </h5>
-    <div class="card-body">
-    {% if nonracked_devices %}
-        <table class="table table-hover">
-            <tr>
-                <th>{% trans "Name" %}</th>
-                <th>{% trans "Role" %}</th>
-                <th>{% trans "Type" %}</th>
-                <th colspan="2">{% trans "Parent Device" %}</th>
-            </tr>
-            {% for device in nonracked_devices %}
-            <tr{% if device.device_type.u_height %} class="warning"{% endif %}>
-                <td>
-                    <a href="{% url 'dcim:device' pk=device.pk %}">{{ device }}</a>
-                </td>
-                <td>{{ device.role }}</td>
-                <td>{{ device.device_type }}</td>
-                {% if device.parent_bay %}
-                    <td>{{ device.parent_bay.device|linkify }}</td>
-                    <td>{{ device.parent_bay }}</td>
-                {% else %}
-                    <td colspan="2" class="text-muted">&mdash;</td>
-                {% endif %}
-            </tr>
-            {% endfor %}
-        </table>
-
-        {%  if total_nonracked_devices_count > nonracked_devices.count %}
-            {% if object|meta:'verbose_name' == 'site' %}
-                <div class="text-muted">
-                  {% blocktrans with count=nonracked_devices.count total=total_nonracked_devices_count %}
-                    Displaying {{ count }} of {{ total }} devices
-                  {% endblocktrans %}
-                  (<a href="{% url 'dcim:device_list' %}?site_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
-                </div>
-            {% elif object|meta:'verbose_name' == 'location' %}
-                <div class="text-muted">
-                  {% blocktrans with count=nonracked_devices.count total=total_nonracked_devices_count %}
-                    Displaying {{ count }} of {{ total }} devices
-                  {% endblocktrans %}
-                  (<a href="{% url 'dcim:device_list' %}?location_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
-                </div>
-            {% endif %}
-        {% endif %}
-
-    {% else %}
-        <div class="text-muted">
-            {% trans "None" %}
-        </div>
-    {% endif %}
-    </div>
-
-    {% if perms.dcim.add_device %}
-        {% if object|meta:'verbose_name' == 'rack' %}
-        <div class="card-footer text-end noprint">
-            <a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&rack={{ object.pk }}" class="btn btn-primary btn-sm">
-                <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
-                {% trans "Add a Non-Racked Device" %}
-            </a>
-        </div>
-        {% elif object|meta:'verbose_name' == 'site' %}
-        <div class="card-footer text-end noprint">
-            <a href="{% url 'dcim:device_add' %}?site={{ object.pk }}" class="btn btn-primary btn-sm">
-                <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
-                {% trans "Add a Non-Racked Device" %}
-            </a>
-        </div>
-        {% elif object|meta:'verbose_name' == 'location' %}
-        <div class="card-footer text-end noprint">
-            <a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&location={{ object.pk }}" class="btn btn-primary btn-sm">
-                <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
-                {% trans "Add a Non-Racked Device" %}
-            </a>
-        </div>
-        {% endif %}
-    {% endif %}
-</div>
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -66,7 +66,6 @@
  </div>
 	<div class="col col-md-6">
    {% include 'inc/panels/related_objects.html' %}
-    {% include 'dcim/inc/nonracked_devices.html' %}
    {% include 'inc/panels/image_attachments.html' %}
    {% plugin_right_page object %}
 	</div>
@@ -79,6 +78,27 @@
        hx-get="{% url 'dcim:location_list' %}?parent_id={{ object.pk }}"
        hx-trigger="load"
      ></div>
+      {% if perms.dcim.add_location %}
+        <div class="card-footer text-end noprint">
+          <a href="{% url 'dcim:location_add' %}?site={{ object.site.pk }}&parent={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Location" %}
+          </a>
+        </div>
+      {% endif %}
+    </div>
+    <div class="card">
+      <h5 class="card-header">Non-Racked Devices</h5>
+      <div class="card-body htmx-container table-responsive"
+        hx-get="{% url 'dcim:device_list' %}?location_id={{ object.pk }}&rack_id=null&parent_bay_id=null"
+        hx-trigger="load"
+      ></div>
+      {% if perms.dcim.add_device %}
+        <div class="card-footer text-end noprint">
+          <a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&location={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Device" %}
+          </a>
+        </div>
+      {% endif %}
    </div>
    {% plugin_full_width_page object %}
  </div>
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -44,17 +44,6 @@
            <th scope="row">{% trans "Config Template" %}</th>
            <td>{{ object.config_template|linkify|placeholder }}</td>
          </tr>
-          <tr>
-            <th scope="row">
-              {% trans "NAPALM Driver" %}
-              <i
-                class="mdi mdi-alert-box text-warning"
-                data-bs-toggle="tooltip"
-                data-bs-placement="right"
-                title="{% trans "This field has been deprecated, and will be removed in NetBox v3.6" %}."
-              ></i>
-            </th>
-          </tr>
        </table>
      </div>
    </div>
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -132,56 +132,40 @@
    </div>
    <div class="col col-md-6">
      {% include 'inc/panels/related_objects.html' with filter_name='site_id' %}
-      <div class="card">
-        <h5 class="card-header">{% trans "Locations" %}</h5>
-        <div class='card-body'>
-          {% if locations %}
-            <table class="table table-hover">
-              <tr>
-                <th>{% trans "Location" %}</th>
-                <th>{% trans "Racks" %}</th>
-                <th>{% trans "Devices" %}</th>
-                <th></th>
-              </tr>
-              {% for location in locations %}
-                <tr>
-                  <td>
-                    {% for i in location.level|as_range %}<i class="mdi mdi-circle-small"></i>{% endfor %}
-                    {{ location|linkify }}
-                  </td>
-                  <td>
-                    <a href="{% url 'dcim:rack_list' %}?location_id={{ location.pk }}">{{ location.rack_count }}</a>
-                  </td>
-                  <td>
-                    <a href="{% url 'dcim:device_list' %}?location_id={{ location.pk }}">{{ location.device_count }}</a>
-                  </td>
-                  <td class="text-end noprint">
-                    <a href="{% url 'dcim:rack_elevation_list' %}?location_id={{ location.pk }}" class="btn btn-sm btn-primary" title="{% trans "View Elevations" %}">
-                      <i class="mdi mdi-server"></i>
-                    </a>
-                  </td>
-                </tr>
-              {% endfor %}
-            </table>
-          {% else %}
-            <span class="text-muted">{% trans "None" %}</span>
-          {% endif %}
-        </div>
-        {% if perms.dcim.add_location %}
-          <div class="card-footer text-end noprint">
-            <a href="{% url 'dcim:location_add' %}?site={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
-              <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a location" %}
-            </a>
-          </div>
-        {% endif %}
-      </div>
      {% include 'inc/panels/image_attachments.html' %}
      {% plugin_right_page object %}
 	</div>
 </div>
 <div class="row">
  <div class="col col-md-12">
-    {% include 'dcim/inc/nonracked_devices.html' %}
+    <div class="card">
+      <h5 class="card-header">Locations</h5>
+      <div class="card-body htmx-container table-responsive"
+        hx-get="{% url 'dcim:location_list' %}?site_id={{ object.pk }}"
+        hx-trigger="load"
+      ></div>
+      {% if perms.dcim.add_location %}
+        <div class="card-footer text-end noprint">
+          <a href="{% url 'dcim:location_add' %}?site={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Location" %}
+          </a>
+        </div>
+      {% endif %}
+    </div>
+    <div class="card">
+      <h5 class="card-header">Non-Racked Devices</h5>
+      <div class="card-body htmx-container table-responsive"
+        hx-get="{% url 'dcim:device_list' %}?site_id={{ object.pk }}&rack_id=null&parent_bay_id=null"
+        hx-trigger="load"
+      ></div>
+      {% if perms.dcim.add_device %}
+        <div class="card-footer text-end noprint">
+          <a href="{% url 'dcim:device_add' %}?site={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Device" %}
+          </a>
+        </div>
+      {% endif %}
+    </div>
    {% plugin_full_width_page object %}
  </div>
 </div>
--- a/netbox/templates/extras/configrevision.html
+++ b/netbox/templates/extras/configrevision.html
@@ -14,6 +14,13 @@
  <div class="controls">
    <div class="control-group">
      {% plugin_buttons object %}
+      {% if not object.pk or object.is_active and perms.extras.add_configrevision %}
+        {% url 'extras:configrevision_add' as edit_url %}
+        {% include "buttons/edit.html" with url=edit_url %}
+      {% endif %}
+      {% if object.pk and not object.is_active and perms.extras.delete_configrevision %}
+        {% delete_button object %}
+      {% endif %}
    </div>
    <div class="control-group">
      {% custom_links object %}
@@ -21,19 +28,27 @@
  </div>
 {% endblock controls %}

+{% block subtitle %}
+  {% if object.created %}
+    <div class="object-subtitle">
+      <span>{% trans "Created" %} {{ object.created|annotated_date }}</span>
+    </div>
+  {% endif %}
+{% endblock subtitle %}
+
 {% block content %}
  <div class="row">
-    <div class="col col-md-6">
+    <div class="col col-md-12">
      <div class="card">
-        <h5 class="card-header">{% trans "Rack Elevation" %}</h5>
+        <h5 class="card-header">{% trans "Rack Elevations" %}</h5>
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Rack elevation default unit height" %}:</th>
+              <th scope="row">{% trans "Default unit height" %}</th>
              <td>{{ object.data.RACK_ELEVATION_DEFAULT_UNIT_HEIGHT }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Rack elevation default unit width" %}:</th>
+              <th scope="row">{% trans "Default unit width" %}</th>
              <td>{{ object.data.RACK_ELEVATION_DEFAULT_UNIT_WIDTH }}</td>
            </tr>
          </table>
@@ -41,19 +56,19 @@
      </div>

      <div class="card">
-        <h5 class="card-header">{% trans "Power" %}</h5>
+        <h5 class="card-header">{% trans "Power Feeds" %}</h5>
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Powerfeed default voltage" %}:</th>
+              <th scope="row">{% trans "Default voltage" %}</th>
              <td>{{ object.data.POWERFEED_DEFAULT_VOLTAGE }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Powerfeed default amperage" %}:</th>
+              <th scope="row">{% trans "Default amperage" %}</th>
              <td>{{ object.data.POWERFEED_DEFAULT_AMPERAGE }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Powerfeed default max utilization" %}:</th>
+              <th scope="row">{% trans "Default max utilization" %}</th>
              <td>{{ object.data.POWERFEED_DEFAULT_MAX_UTILIZATION }}</td>
            </tr>
          </table>
@@ -65,11 +80,11 @@
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Enforce global unique" %}:</th>
+              <th scope="row">{% trans "Enforce global unique" %}</th>
              <td>{{ object.data.ENFORCE_GLOBAL_UNIQUE }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Prefer IPv4" %}:</th>
+              <th scope="row">{% trans "Prefer IPv4" %}</th>
              <td>{{ object.data.PREFER_IPV4 }}</td>
            </tr>
          </table>
@@ -81,8 +96,8 @@
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Allowed URL schemes" %}:</th>
-              <td>{{ object.data.ALLOWED_URL_SCHEMES }}</td>
+              <th scope="row">{% trans "Allowed URL schemes" %}</th>
+              <td>{{ object.data.ALLOWED_URL_SCHEMES|join:", "|placeholder }}</td>
            </tr>
          </table>
        </div>
@@ -93,39 +108,35 @@
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Login banner" %}:</th>
+              <th scope="row">{% trans "Login banner" %}</th>
              <td>{{ object.data.BANNER_LOGIN }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Maintenance banner" %}:</th>
+              <th scope="row">{% trans "Maintenance banner" %}</th>
              <td>{{ object.data.BANNER_MAINTENANCE }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Top banner" %}:</th>
+              <th scope="row">{% trans "Top banner" %}</th>
              <td>{{ object.data.BANNER_TOP }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Bottom banner" %}:</th>
+              <th scope="row">{% trans "Bottom banner" %}</th>
              <td>{{ object.data.BANNER_BOTTOM }}</td>
            </tr>
          </table>
        </div>
      </div>

-
-    </div>
-    <div class="col col-md-6">
-
      <div class="card">
        <h5 class="card-header">{% trans "Pagination" %}</h5>
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Paginate count" %}:</th>
+              <th scope="row">{% trans "Paginate count" %}</th>
              <td>{{ object.data.PAGINATE_COUNT }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Max page size" %}:</th>
+              <th scope="row">{% trans "Max page size" %}</th>
              <td>{{ object.data.MAX_PAGE_SIZE }}</td>
            </tr>
          </table>
@@ -137,8 +148,8 @@
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Custom validators" %}:</th>
-              <td>{{ object.data.CUSTOM_VALIDATORS }}</td>
+              <th scope="row">{% trans "Custom validators" %}</th>
+              <td>{{ object.data.CUSTOM_VALIDATORS|placeholder }}</td>
            </tr>
          </table>
        </div>
@@ -149,8 +160,8 @@
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Default user preferences" %}:</th>
-              <td>{{ object.data.DEFAULT_USER_PREFERENCES }}</td>
+              <th scope="row">{% trans "Default user preferences" %}</th>
+              <td>{{ object.data.DEFAULT_USER_PREFERENCES|placeholder }}</td>
            </tr>
          </table>
        </div>
@@ -161,23 +172,23 @@
        <div class="card-body">
          <table class="table table-hover attr-table">
            <tr>
-              <th scope="row">{% trans "Maintenance mode" %}:</th>
+              <th scope="row">{% trans "Maintenance mode" %}</th>
              <td>{{ object.data.MAINTENANCE_MODE }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "GraphQL enabled" %}:</th>
+              <th scope="row">{% trans "GraphQL enabled" %}</th>
              <td>{{ object.data.GRAPHQL_ENABLED }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Changelog retention" %}:</th>
+              <th scope="row">{% trans "Changelog retention" %}</th>
              <td>{{ object.data.CHANGELOG_RETENTION }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Job retention" %}:</th>
+              <th scope="row">{% trans "Job retention" %}</th>
              <td>{{ object.data.JOB_RETENTION }}</td>
            </tr>
            <tr>
-              <th scope="row">{% trans "Maps URL" %}:</th>
+              <th scope="row">{% trans "Maps URL" %}</th>
              <td>{{ object.data.MAPS_URL }}</td>
            </tr>
          </table>
@@ -185,14 +196,9 @@
      </div>

      <div class="card">
-        <h5 class="card-header">{% trans "Config Revision" %}</h5>
+        <h5 class="card-header">{% trans "Comment" %}</h5>
        <div class="card-body">
-          <table class="table table-hover attr-table">
-            <tr>
-              <th scope="row">{% trans "Comment" %}:</th>
-              <td>{{ object.comment }}</td>
-            </tr>
-          </table>
+          {{ object.comment|placeholder }}
        </div>
      </div>

--- a/netbox/templates/extras/customfield.html
+++ b/netbox/templates/extras/customfield.html
@@ -125,6 +125,24 @@
        </table>
      </div>
    </div>
+    <div class="card">
+      <h5 class="card-header">Related Objects</h5>
+      <ul class="list-group list-group-flush">
+        {% for qs in related_models %}
+          <a class="list-group-item list-group-item-action d-flex justify-content-between">
+            {{ qs.model|meta:"verbose_name_plural"|bettertitle }}
+            {% with count=qs.count %}
+              {% if count %}
+                <span class="badge bg-primary rounded-pill">{{ count }}</span>
+              {% else %}
+                <span class="badge bg-light rounded-pill">&mdash;</span>
+              {% endif %}
+            {% endwith %}
+          </a>
+        {% endfor %}
+      </ul>
+    </div>
+
    {% plugin_right_page object %}
  </div>
 </div>
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -46,8 +46,10 @@ Context:
 {% block subtitle %}
  <div class="object-subtitle">
    <span>{% trans "Created" %} {{ object.created|annotated_date }}</span>
-    <span class="separator">&middot;</span>
-    <span>{% trans "Updated" %} <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> {% trans "ago" %}</span>
+    {% if object.last_updated %}
+      <span class="separator">&middot;</span>
+      <span>{% trans "Updated" %} <span title="{{ object.last_updated }}">{{ object.last_updated|timesince }}</span> {% trans "ago" %}</span>
+    {% endif %}
  </div>
 {% endblock subtitle %}

--- a/netbox/templates/ipam/vlangroup.html
+++ b/netbox/templates/ipam/vlangroup.html
@@ -59,15 +59,4 @@
    {% plugin_right_page object %}
  </div>
 </div>
-<div class="row mb-3">
-	<div class="col col-md-12">
-    <div class="card">
-      <h5 class="card-header">{% trans "VLANs" %}</h5>
-      <div class="card-body table-responsive">
-        {% render_table vlans_table 'inc/table.html' %}
-        {% include 'inc/paginator.html' with paginator=vlans_table.paginator page=vlans_table.page %}
-      </div>
-    </div>
-  </div>
-</div>
 {% endblock %}
--- a/netbox/templates/users/user.html
+++ b/netbox/templates/users/user.html
@@ -32,7 +32,7 @@
            </tr>
            <tr>
              <th scope="row">{% trans "Active" %}</th>
-              <td>{% checkmark object.active %}</td>
+              <td>{% checkmark object.is_active %}</td>
            </tr>
            <tr>
              <th scope="row">{% trans "Staff" %}</th>
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -1,11 +1,12 @@
 from django.conf import settings
+from django.contrib.auth import authenticate
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from drf_spectacular.utils import extend_schema_field
 from drf_spectacular.types import OpenApiTypes
 from rest_framework import serializers
-from rest_framework.exceptions import PermissionDenied
+from rest_framework.exceptions import AuthenticationFailed, PermissionDenied

 from netbox.api.fields import ContentTypeField, IPNetworkSerializer, SerializedPKRelatedField
 from netbox.api.serializers import ValidatedModelSerializer
@@ -107,9 +108,42 @@ class TokenSerializer(ValidatedModelSerializer):
        return super().validate(data)


-class TokenProvisionSerializer(serializers.Serializer):
-    username = serializers.CharField()
-    password = serializers.CharField()
+class TokenProvisionSerializer(TokenSerializer):
+    user = NestedUserSerializer(
+        read_only=True
+    )
+    username = serializers.CharField(
+        write_only=True
+    )
+    password = serializers.CharField(
+        write_only=True
+    )
+    last_used = serializers.DateTimeField(
+        read_only=True
+    )
+    key = serializers.CharField(
+        read_only=True
+    )
+
+    class Meta:
+        model = Token
+        fields = (
+            'id', 'url', 'display', 'user', 'created', 'expires', 'last_used', 'key', 'write_enabled', 'description',
+            'allowed_ips', 'username', 'password',
+        )
+
+    def validate(self, data):
+        # Validate the username and password
+        username = data.pop('username')
+        password = data.pop('password')
+        user = authenticate(request=self.context.get('request'), username=username, password=password)
+        if user is None:
+            raise AuthenticationFailed("Invalid username/password")
+
+        # Inject the user into the validated data
+        data['user'] = user
+
+        return data


 class ObjectPermissionSerializer(ValidatedModelSerializer):
--- a/netbox/users/api/views.py
+++ b/netbox/users/api/views.py
@@ -1,3 +1,4 @@
+import logging
 from django.contrib.auth import authenticate
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
@@ -60,31 +61,24 @@ class TokenProvisionView(APIView):
    """
    permission_classes = []

-    # @extend_schema(methods=["post"], responses={201: serializers.TokenSerializer})
+    @extend_schema(
+        request=serializers.TokenProvisionSerializer,
+        responses={
+            201: serializers.TokenProvisionSerializer,
+            401: OpenApiTypes.OBJECT,
+        }
+    )
    def post(self, request):
-        serializer = serializers.TokenProvisionSerializer(data=request.data)
-        serializer.is_valid()
+        serializer = serializers.TokenProvisionSerializer(data=request.data, context={'request': request})
+        serializer.is_valid(raise_exception=True)
+        self.perform_create(serializer)
+        return Response(serializer.data, status=HTTP_201_CREATED)

-        # Authenticate the user account based on the provided credentials
-        username = serializer.data.get('username')
-        password = serializer.data.get('password')
-        if not username or not password:
-            raise AuthenticationFailed("Username and password must be provided to provision a token.")
-        user = authenticate(request=request, username=username, password=password)
-        if user is None:
-            raise AuthenticationFailed("Invalid username/password")
-
-        # Create a new Token for the User
-        token = Token(user=user)
-        token.save()
-        data = serializers.TokenSerializer(token, context={'request': request}).data
-        # Manually append the token key, which is normally write-only
-        data['key'] = token.key
-
-        return Response(data, status=HTTP_201_CREATED)
-
-    def get_serializer_class(self):
-        return serializers.TokenSerializer
+    def perform_create(self, serializer):
+        model = serializer.Meta.model
+        logger = logging.getLogger(f'netbox.api.views.TokenProvisionView')
+        logger.info(f"Creating new {model._meta.verbose_name}")
+        serializer.save()


 #
--- a/netbox/users/constants.py
+++ b/netbox/users/constants.py
@@ -2,7 +2,7 @@ from django.db.models import Q


 OBJECTPERMISSION_OBJECT_TYPES = Q(
-    ~Q(app_label__in=['admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']) |
+    ~Q(app_label__in=['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']) |
    Q(app_label='auth', model__in=['group', 'user']) |
    Q(app_label='users', model__in=['objectpermission', 'token'])
 )
--- a/netbox/users/migrations/0001_squashed_0011.py
+++ b/netbox/users/migrations/0001_squashed_0011.py
@@ -66,7 +66,7 @@ class Migration(migrations.Migration):
                ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
                ('constraints', models.JSONField(blank=True, null=True)),
                ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
-                ('object_types', models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='contenttypes.ContentType')),
+                ('object_types', models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='contenttypes.ContentType')),
                ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
            ],
            options={
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -141,17 +141,25 @@ class TokenTest(
        """
        Test the provisioning of a new REST API token given a valid username and password.
        """
-        data = {
+        user_credentials = {
            'username': 'user1',
            'password': 'abc123',
        }
-        user = User.objects.create_user(**data)
+        user = User.objects.create_user(**user_credentials)
+
+        data = {
+            **user_credentials,
+            'description': 'My API token',
+            'expires': '2099-12-31T23:59:59Z',
+        }
        url = reverse('users-api:token_provision')

        response = self.client.post(url, data, format='json', **self.header)
        self.assertEqual(response.status_code, 201)
        self.assertIn('key', response.data)
        self.assertEqual(len(response.data['key']), 40)
+        self.assertEqual(response.data['description'], data['description'])
+        self.assertEqual(response.data['expires'], data['expires'])
        token = Token.objects.get(user=user)
        self.assertEqual(token.key, response.data['key'])

--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -68,7 +68,7 @@ class UserView(generic.ObjectView):
    template_name = 'users/user.html'

    def get_extra_context(self, request, instance):
-        changelog = ObjectChange.objects.restrict(request.user, 'view').filter(user=request.user)[:20]
+        changelog = ObjectChange.objects.restrict(request.user, 'view').filter(user=instance)[:20]
        changelog_table = ObjectChangeTable(changelog)

        return {
--- a/netbox/utilities/constants.py
+++ b/netbox/utilities/constants.py
@@ -20,7 +20,8 @@ FILTER_NUMERIC_BASED_LOOKUP_MAP = dict(
    lte='lte',
    lt='lt',
    gte='gte',
-    gt='gt'
+    gt='gt',
+    empty='isnull',
 )

 FILTER_NEGATION_LOOKUP_MAP = dict(
@@ -45,6 +46,10 @@ HTTP_REQUEST_META_SAFE_COPY = [
    'HTTP_REFERER',
    'HTTP_USER_AGENT',
    'HTTP_X_FORWARDED_FOR',
+    'HTTP_X_FORWARDED_HOST',
+    'HTTP_X_FORWARDED_PORT',
+    'HTTP_X_FORWARDED_PROTO',
+    'HTTP_X_REAL_IP',
    'QUERY_STRING',
    'REMOTE_ADDR',
    'REMOTE_HOST',
--- a/netbox/utilities/counters.py
+++ b/netbox/utilities/counters.py
@@ -27,7 +27,7 @@ def update_counter(model, pk, counter_name, value):
 # Signal handlers
 #

-def post_save_receiver(sender, instance, **kwargs):
+def post_save_receiver(sender, instance, created, **kwargs):
    """
    Update counter fields on related objects when a TrackingModelMixin subclass is created or modified.
    """
@@ -39,7 +39,7 @@ def post_save_receiver(sender, instance, **kwargs):
        # Update the counters on the old and/or new parents as needed
        if old_pk is not None:
            update_counter(parent_model, old_pk, counter_name, -1)
-        if new_pk is not None:
+        if new_pk is not None and (old_pk or created):
            update_counter(parent_model, new_pk, counter_name, 1)


--- a/netbox/utilities/fields.py
+++ b/netbox/utilities/fields.py
@@ -105,6 +105,10 @@ class RestrictedGenericForeignKey(GenericForeignKey):
            # We avoid looking for values if either ct_id or fkey value is None
            ct_id = getattr(instance, ct_attname)
            if ct_id is not None:
+                # Check if the content type actually exists
+                if not self.get_content_type(id=ct_id, using=instance._state.db).model_class():
+                    continue
+
                fk_val = getattr(instance, self.fk_field)
                if fk_val is not None:
                    fk_dict[ct_id].add(fk_val)
@@ -129,13 +133,14 @@ class RestrictedGenericForeignKey(GenericForeignKey):
            if ct_id is None:
                return None
            else:
-                model = self.get_content_type(
+                if model := self.get_content_type(
                    id=ct_id, using=obj._state.db
-                ).model_class()
-                return (
-                    model._meta.pk.get_prep_value(getattr(obj, self.fk_field)),
-                    model,
-                )
+                ).model_class():
+                    return (
+                        model._meta.pk.get_prep_value(getattr(obj, self.fk_field)),
+                        model,
+                    )
+                return None

        return (
            ret_val,
--- a/netbox/utilities/templates/helpers/utilization_graph.html
+++ b/netbox/utilities/templates/helpers/utilization_graph.html
@@ -1,3 +1,4 @@
+{% load l10n %}
 <div class="progress">
  <div
    role="progressbar"
@@ -5,7 +6,7 @@
    aria-valuemax="100"
    aria-valuenow="{{ utilization }}"
    class="progress-bar {{ bar_class }}"
-    style="width: {{ utilization }}%;"
+    style="width: {{ utilization|unlocalize }}%;"
  >
    {% if utilization >= 35 %}{{ utilization|floatformat:1 }}%{% endif %}
  </div>
--- a/netbox/utilities/templatetags/navigation.py
+++ b/netbox/utilities/templatetags/navigation.py
@@ -26,11 +26,14 @@ def nav(context: Context) -> Dict:
        for group in menu.groups:
            items = []
            for item in group.items:
-                if user.has_perms(item.permissions):
-                    buttons = [
-                        button for button in item.buttons if user.has_perms(button.permissions)
-                    ]
-                    items.append((item, buttons))
+                if not user.has_perms(item.permissions):
+                    continue
+                if item.staff_only and not user.is_staff:
+                    continue
+                buttons = [
+                    button for button in item.buttons if user.has_perms(button.permissions)
+                ]
+                items.append((item, buttons))
            if items:
                groups.append((group, items))
        if groups:
--- a/netbox/utilities/tests/test_counters.py
+++ b/netbox/utilities/tests/test_counters.py
@@ -29,13 +29,17 @@ class CountersTest(TestCase):
        self.assertEqual(device1.interface_count, 2)
        self.assertEqual(device2.interface_count, 2)

-        Interface.objects.create(device=device1, name='Interface 5')
+        interface1 = Interface.objects.create(device=device1, name='Interface 5')
        Interface.objects.create(device=device2, name='Interface 6')
        device1.refresh_from_db()
        device2.refresh_from_db()
        self.assertEqual(device1.interface_count, 3)
        self.assertEqual(device2.interface_count, 3)

+        interface1.save()
+        device1.refresh_from_db()
+        self.assertEqual(device1.interface_count, 3)
+
    def test_interface_count_deletion(self):
        """
        When a tracked object (Interface) is deleted the tracking counter should be updated.
--- a/netbox/utilities/tests/test_filters.py
+++ b/netbox/utilities/tests/test_filters.py
@@ -86,6 +86,10 @@ class DummyModel(models.Model):
    charfield = models.CharField(
        max_length=10
    )
+    numberfield = models.IntegerField(
+        blank=True,
+        null=True
+    )
    choicefield = models.IntegerField(
        choices=(('A', 1), ('B', 2), ('C', 3))
    )
@@ -108,6 +112,7 @@ class BaseFilterSetTest(TestCase):
    """
    class DummyFilterSet(BaseFilterSet):
        charfield = django_filters.CharFilter()
+        numberfield = django_filters.NumberFilter()
        macaddressfield = MACAddressFilter()
        modelchoicefield = django_filters.ModelChoiceFilter(
            field_name='integerfield',  # We're pretending this is a ForeignKey field
@@ -132,6 +137,7 @@ class BaseFilterSetTest(TestCase):
            model = DummyModel
            fields = (
                'charfield',
+                'numberfield',
                'choicefield',
                'datefield',
                'datetimefield',
@@ -171,6 +177,25 @@ class BaseFilterSetTest(TestCase):
        self.assertEqual(self.filters['charfield__iew'].exclude, False)
        self.assertEqual(self.filters['charfield__niew'].lookup_expr, 'iendswith')
        self.assertEqual(self.filters['charfield__niew'].exclude, True)
+        self.assertEqual(self.filters['charfield__empty'].lookup_expr, 'empty')
+        self.assertEqual(self.filters['charfield__empty'].exclude, False)
+
+    def test_number_filter(self):
+        self.assertIsInstance(self.filters['numberfield'], django_filters.NumberFilter)
+        self.assertEqual(self.filters['numberfield'].lookup_expr, 'exact')
+        self.assertEqual(self.filters['numberfield'].exclude, False)
+        self.assertEqual(self.filters['numberfield__n'].lookup_expr, 'exact')
+        self.assertEqual(self.filters['numberfield__n'].exclude, True)
+        self.assertEqual(self.filters['numberfield__lt'].lookup_expr, 'lt')
+        self.assertEqual(self.filters['numberfield__lt'].exclude, False)
+        self.assertEqual(self.filters['numberfield__lte'].lookup_expr, 'lte')
+        self.assertEqual(self.filters['numberfield__lte'].exclude, False)
+        self.assertEqual(self.filters['numberfield__gt'].lookup_expr, 'gt')
+        self.assertEqual(self.filters['numberfield__gt'].exclude, False)
+        self.assertEqual(self.filters['numberfield__gte'].lookup_expr, 'gte')
+        self.assertEqual(self.filters['numberfield__gte'].exclude, False)
+        self.assertEqual(self.filters['numberfield__empty'].lookup_expr, 'isnull')
+        self.assertEqual(self.filters['numberfield__empty'].exclude, False)

    def test_mac_address_filter(self):
        self.assertIsInstance(self.filters['macaddressfield'], MACAddressFilter)
--- a/netbox/virtualization/migrations/0035_virtualmachine_interface_count.py
+++ b/netbox/virtualization/migrations/0035_virtualmachine_interface_count.py
@@ -7,12 +7,12 @@ import utilities.fields
 def populate_virtualmachine_counts(apps, schema_editor):
    VirtualMachine = apps.get_model('virtualization', 'VirtualMachine')

-    vms = list(VirtualMachine.objects.annotate(_interface_count=Count('interfaces', distinct=True)))
+    vms = VirtualMachine.objects.annotate(_interface_count=Count('interfaces', distinct=True))

    for vm in vms:
        vm.interface_count = vm._interface_count

-    VirtualMachine.objects.bulk_update(vms, ['interface_count'])
+    VirtualMachine.objects.bulk_update(vms, ['interface_count'], batch_size=100)


 class Migration(migrations.Migration):
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -387,7 +387,6 @@ class VirtualMachineConfigContextView(ObjectConfigContextView):
    base_template = 'virtualization/virtualmachine.html'
    tab = ViewTab(
        label=_('Config Context'),
-        permission='extras.view_configcontext',
        weight=2000
    )

@@ -398,7 +397,6 @@ class VirtualMachineRenderConfigView(generic.ObjectView):
    template_name = 'virtualization/virtualmachine/render_config.html'
    tab = ViewTab(
        label=_('Render Config'),
-        permission='extras.view_configtemplate',
        weight=2100
    )

--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 bleach==6.0.0
-Django==4.2.4
+Django==4.2.5
 django-cors-headers==4.2.0
 django-debug-toolbar==4.2.0
 django-filter==23.2
@@ -12,23 +12,23 @@ django-rich==1.7.0
 django-rq==2.8.1
 django-tables2==2.6.0
 django-taggit==4.0.0
-django-timezone-field==5.1
+django-timezone-field==6.0
 djangorestframework==3.14.0
 drf-spectacular==0.26.4
-drf-spectacular-sidecar==2023.8.1
+drf-spectacular-sidecar==2023.9.1
 feedparser==6.0.10
 graphene-django==3.0.0
 gunicorn==21.2.0
 Jinja2==3.1.2
 Markdown==3.3.7
-mkdocs-material==9.1.21
-mkdocstrings[python-legacy]==0.22.0
+mkdocs-material==9.2.7
+mkdocstrings[python-legacy]==0.23.0
 netaddr==0.8.0
 Pillow==10.0.0
 psycopg[binary,pool]==3.1.10
 PyYAML==6.0.1
-sentry-sdk==1.29.2
-social-auth-app-django==5.2.0
+sentry-sdk==1.30.0
+social-auth-app-django==5.3.0
 social-auth-core[openidconnect]==4.4.2
 svgwrite==1.4.3
 tablib==3.5.0
Author	SHA1	Message	Date
Jeremy Stretch	99ab054ea0	Merge pull request #13705 from netbox-community/develop Release v3.6.1	2023-09-06 14:23:36 -04:00
Jeremy Stretch	90ab4b3c86	Release v3.6.1	2023-09-06 14:04:57 -04:00
Arthur Hanson	bb6b4d01c1	12553 prefix serializer to IPAddress (#13592 ) * 12553 prefix serializer to IPAddress * Introduce IPNetworkField to handle prefix serialization --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>	2023-09-06 10:49:40 -04:00
Daniel Sheppard	2d1457b94b	Fixes: #13682 - Fix custom field exceptions and validation (#13685 ) * Fixes: #13682 - Fix custom field exceptions and validation * Add tests * Remove default setting for multi-select/multi-object and return slice of choices and annotate. * Remove redundant default choice valiadtion; introduce values property on CustomFieldChoiceSet * Refactor test --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>	2023-09-06 10:47:18 -04:00
Arthur Hanson	9d851924c8	13674 fix ReportSerializer (#13688 ) * 13674 fix ReportSerializer * Remove test_methods attr from Report class --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>	2023-09-06 08:44:25 -04:00
Jeremy Stretch	9be5918c83	Fixes #13684 : Enable modying the configuration when maintenance mode is enabled	2023-09-05 14:09:38 -04:00
Jeremy Stretch	6db6616892	Changelog for #12870 , #13444 , #13596 , #13642 , #13657	2023-09-01 17:14:59 -04:00
Abhimanyu Saharan	004daca862	Adds rename button on the list page for device components (#13564 ) * adds interface rename button on the list page #13444 * adds rename view on all device components #13564 * Condense component views to a single template --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>	2023-09-01 16:58:31 -04:00
Jeremy Stretch	559f65f6b2	Add #12906 to v3.6.0 changelog	2023-09-01 13:22:07 -04:00
Jeremy Stretch	c38884fa11	Add description & expires fields to token test	2023-09-01 12:33:02 -04:00
Abhimanyu Saharan	7848beedce	adds additional parameters for token provision api #12870	2023-09-01 12:33:02 -04:00
Jeremy Stretch	296166da95	Fixes #13656 : Correct decoding of BinaryField content for Django 4.2	2023-09-01 11:06:19 -04:00
Jeremy Stretch	679cc8fdda	Fixes #13596 : Always display "render config" tab for devices & VMs	2023-08-31 14:36:03 -04:00
Jeremy Stretch	0cdc26e013	Fixes #13642 : Move migration logic overrides from individual mgmt commands to core	2023-08-31 14:34:26 -04:00
Jeremy Stretch	2503568875	Changelog for #13619 , #13620 , #13622 , #13628 , #13632 , #13638	2023-08-31 12:23:59 -04:00
Jeremy Stretch	78966e12a9	Fixes #13620 : Show admin menu items only for staff users	2023-08-31 12:20:46 -04:00
Jeremy Stretch	f962fb3b53	Closes #13638 : Add optional staff_only attribute to MenuItem (#13639 ) * Closes #13638: Add optional staff_only attribute to MenuItem * Add missing file * Add release note	2023-08-31 11:23:44 -04:00
Jeremy Stretch	2544e2bf18	Fixes #13622 : Fix exception when viewing current config and no revisions have been created	2023-08-31 11:11:56 -04:00
Jeremy Stretch	06f2c6f867	Fixes #13632 : Avoid raising exception when checking if FHRP group IP address is primary	2023-08-31 11:09:49 -04:00
Abhimanyu Saharan	272d2c54d4	removes napalm references #13628	2023-08-31 09:54:35 -04:00
Jeremy Stretch	cb93abb0f4	Fixes #13626 : Correct filtering of recent activity list under user view	2023-08-31 08:19:17 -04:00
Jeremy Stretch	316d991b33	Fixes #13630 : Fix display of active status under user view	2023-08-31 08:16:11 -04:00
Jamie (Bear) Murphy	46f734eba2	fix error for is_oob_ip for non-device parents (#13621 ) * fix error for is_oob_ip for non-device parents * adjust oob_ip_id check to use hasattr	2023-08-31 07:57:14 -04:00
Jeremy Stretch	671a56100a	PRVB	2023-08-30 14:57:16 -04:00
Jeremy Stretch	dfcfbe240d	Merge pull request #13614 from netbox-community/develop Release v3.6.0	2023-08-30 14:51:04 -04:00
Jeremy Stretch	b040fdcf2c	Release v3.6.0	2023-08-30 14:27:07 -04:00
Jeremy Stretch	8525f994c0	Fix invalid links	2023-08-30 14:21:04 -04:00
Jeremy Stretch	eb9a804914	#12591 : Add a dedicated view for the active config revision	2023-08-30 11:13:56 -04:00
Jeremy Stretch	210d7bb573	Display last_updated time only if defined	2023-08-30 11:13:02 -04:00
Jeremy Stretch	dc85476b9e	Changelog for #11478 , #13513 , #13599 , #13605	2023-08-30 09:36:44 -04:00
Daniel Sheppard	1854a6b76b	Fix #11478 - Add vc_interfaces flag to control selection of VC interfaces (#13296 ) * Add `vc_interfaces` flag to control interface queryset * Fix test failure * Add new filters instead of using undocumented query params * Cleanup filterset, add test * Rename filter and re-introduce virtual_chassis filtering method (required) * Fix test * Adjust tests to more accurately provide coverage * Add breaking change note * Misc cleanup --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>	2023-08-30 09:33:02 -04:00
Jeremy Stretch	aebf3288d1	Fixes #13605 : Specify batch size for cached counter migrations (#13610 ) * Specify batch size for cached counter migrations * Remove list() casting of querysets	2023-08-30 09:18:24 -04:00
Arthur Hanson	065a40dfb3	13599 fix cached counter for edit object (#13600 ) * 13599 fix cache counter * 13599 update test * Merge conditionals --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>	2023-08-29 15:31:13 -04:00
Jeremy Stretch	83536fbb23	#12814 : Add context data section to config rendering doc	2023-08-29 14:43:07 -04:00
Jeremy Stretch	420090dc6c	#12590 : Exclude proxy model for Token from permission object types	2023-08-29 14:41:14 -04:00
Jeremy Stretch	4ab0eb570c	#11305 : Add latitude & longitude to DeviceWithConfigContextSerializer	2023-08-29 14:31:42 -04:00
Jeremy Stretch	2a4e3dd09f	Merge branch 'develop' into feature	2023-08-29 10:45:55 -04:00
Jeremy Stretch	0dbfbf6941	Merge pull request #13591 from netbox-community/develop Correct version number	2023-08-28 17:07:15 -04:00
Jeremy Stretch	d515530277	Merge branch 'master' into develop	2023-08-28 17:05:59 -04:00
Jeremy Stretch	4343e0566b	Correct version number	2023-08-28 17:04:37 -04:00
Jeremy Stretch	8555269f7e	Merge pull request #13589 from netbox-community/develop Release v3.5.9	2023-08-28 16:58:09 -04:00
Jeremy Stretch	f42a2ac10c	Merge branch 'master' into develop	2023-08-28 16:19:44 -04:00
Jeremy Stretch	4ea3a29c0e	Release v3.5.9	2023-08-28 16:13:13 -04:00
Arthur Hanson	29877c9abe	12489 Use HTMX for Location and Non-Racked Devices in Site detail view (#12491 ) * 12489 use htmx for site view locations and non-racked-devices * 12489 remove now unused queries in context * adds device type and role to device component filter #12015 * Revert "Fixes #12463: Fix the association of completed jobs with reports & scripts in the REST API" This reverts commit `a29a07ed26`. * 12489 update nonracked_devices on rack and location templates * 12489 fix whitespace issue * Undo errant commits * 12489 update site id in templates * 12489 remove nonracked_devices include * 12489 add has_position filter * Use empty lookup for position field * Remove non-racked devices list from rack view (was moved to a tab) * Clean up location and device tables * Restore plugins block on rack template --------- Co-authored-by: Abhimanyu Saharan <desk.abhimanyu@gmail.com> Co-authored-by: jeremystretch <jstretch@netboxlabs.com>	2023-08-28 16:03:35 -04:00
Jeremy Stretch	480f83c42d	Closes #13585 : Introduce 'empty' lookup for numeric value filters	2023-08-28 15:25:37 -04:00
Jeremy Stretch	faf89350ac	Fixes #13569 : Fix selection widgets for related interfaces when bulk editing interfaces under device view	2023-08-28 13:04:42 -04:00
Jeremy Stretch	d9c3ce935f	Changelog for #12825 , #13313 , #13415 , #13507 , #13542 , #13543 , #13544 , #13556	2023-08-28 09:10:44 -04:00
Abhimanyu Saharan	8d8f57e8b8	Adds parent filter on iprange (#13568 ) * adds parent filter on iprange #13313 * lint fix * adds filterset test * Filter should match both start & end of IP range --------- Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>	2023-08-28 09:05:43 -04:00
Abhimanyu Saharan	0a3be0b7ea	adds related models count on custom field #12825	2023-08-28 08:34:33 -04:00
Abhimanyu Saharan	00ebdfe0df	adds related models count on custom field #12825	2023-08-28 08:34:33 -04:00
Jeremy Stretch	d79fa131bb	Closes #13415 : Pass request context when rendering custom links in a table column	2023-08-25 13:14:47 -04:00
Abhimanyu Saharan	be2b24a155	fixes the swagger schema for token provisioning #13557	2023-08-25 09:45:03 -04:00
Abhimanyu Saharan	03b341dbfd	adds missing status choicefield for vdc #13556	2023-08-25 09:40:04 -04:00
Arthur	ca5e69897d	13396 upgrade graphiql	2023-08-24 14:17:09 -04:00
Abhimanyu Saharan	3090dd4934	Fixed permission for config context UI view (#13547 ) * fixed permission for config context UI view #13543 * removed extras.view_configcontext permission #13543	2023-08-24 14:13:31 -04:00
Abhimanyu Saharan	1f1d1ee502	adds additional safe HTTP headers to request #13542	2023-08-24 14:12:08 -04:00
Abhimanyu Saharan	1c2cf11f47	fixes global search when the content type is not found #13507	2023-08-24 14:09:48 -04:00
Jeremy Stretch	08961e751d	Revert changes from #13373 pending further discussion around implementation This reverts commit `66e4e31209`.	2023-08-24 14:02:15 -04:00
Abhimanyu Saharan	88bf82be05	clear all cache when lazy is not used #13544	2023-08-24 10:12:48 -04:00
Jeremy Stretch	506884bc4d	Changelog for #11272 , #13516 , #13530 , #13536	2023-08-23 14:44:14 -04:00
Jeremy Stretch	646fa341ab	Closes #13470 : Remove misleading statement about access to report results	2023-08-23 14:41:38 -04:00
Jeremy Stretch	d73f7b1943	Fixes #13530 : Ensure script log messages are cast as strings for proper serialization	2023-08-23 14:41:21 -04:00
Abhimanyu Saharan	a75e8416a4	adds vlan child table to vlan group #13536	2023-08-23 13:39:10 -04:00
Arthur	f743f2cfb8	11272 make position field work correctly when internationalizion enabled	2023-08-23 13:30:01 -04:00
Jeremy Stretch	7d7e8127f5	Fixes #13513 : Prevent exception when rendering bookmarks widget for anonymous user	2023-08-23 10:53:56 -04:00
Jeremy Stretch	3c0a3ca703	Fixes #13516 : Plugin utility functions should be importable from extras.plugins	2023-08-22 10:27:21 -04:00
Jeremy Stretch	45062697c5	Changelog for #11508 , #13358 , #13477 , #13478 , #13500 , #13503	2023-08-21 15:10:12 -04:00
Arthur Hanson	66e4e31209	11508 Add group assignments for Azure SSO (#13373 ) * 11508 temp azure changes * 11508 map AzureAD groups to NetBox groups * 11508 add is_active, reset superuser and staff based on Azure * 11508 remove is_active, add documentation use azuread * 11508 remove addition to settings * 11508 review changes, add additional logging and error checking * 11508 review changes, remove extra flag * 11508 review changes, change SOCIAL_AUTH_ to REMOTE_AUTH_BACKEND * 11508 clear user groups * 11508 clear user groups * 11508 review feedback change config key * 11508 review changes * 11508 review changes - add error checking * 11508 review changes - flexible config params	2023-08-21 14:42:16 -04:00
kkthxbye-code	c86cfe3cbf	Correct filter name in redirect after bulk edit * Added modified_by_request filter to ChangeLoggedFilterSet	2023-08-21 14:35:08 -04:00
Arthur	28e112743f	13503 fix rack space utilization graph for internationalization	2023-08-21 14:21:50 -04:00
Arthur	229007082b	13510 update docs run permission image	2023-08-21 14:03:31 -04:00
Abhimanyu Saharan	4004966b16	fix content type filter on export template #13478	2023-08-17 15:29:21 -04:00
Arthur	fe95cb434a	13500 fix l2vpntermination bulk update	2023-08-17 15:25:23 -04:00
Alexander Haase	16e2283d19	Fix git DataSource clone authentication Anonymous git clones (in GitLab) require the username and password not to be set in order to successfully clone. This patch will define clone args only, if the username passed is not empty.	2023-08-15 13:29:03 -04:00
Jeremy Stretch	c46536f469	Merge pull request #13474 from jose-d/develop-1 upgrading.md: there shouldbe OLDVER instead of NEWVER	2023-08-15 11:26:43 -04:00
jose_d	9450ce4c3a	upgrading.md: there shouldbe OLDVER instead of NEWVER	2023-08-15 16:19:31 +02:00
Jeremy Stretch	8f5005efd5	Merge pull request #13472 from netbox-community/develop Release v3.5.8	2023-08-15 09:56:23 -04:00