From a12d94a3bcb074cd769d85c94b0eeade7ceee483 Mon Sep 17 00:00:00 2001 From: kobayashi Date: Thu, 23 Jul 2020 01:36:31 -0400 Subject: [PATCH 1/4] Fixes #4880: Fix remove untagged-vlans if not assigned in bulk interfaces edit --- docs/release-notes/version-2.8.md | 1 + netbox/utilities/views.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-2.8.md b/docs/release-notes/version-2.8.md index fb5e8277f..35f91a94d 100644 --- a/docs/release-notes/version-2.8.md +++ b/docs/release-notes/version-2.8.md @@ -6,6 +6,7 @@ * [#4875](https://github.com/netbox-community/netbox/issues/4875) - Fix documentation for image attachments * [#4876](https://github.com/netbox-community/netbox/issues/4876) - Fix labels for sites in staging or decommissioning status +* [#4880](https://github.com/netbox-community/netbox/issues/4880) - Fix remove tagged vlans if not assigned in bulk interface editting --- diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 38fb6d963..cd8ac03c9 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -721,8 +721,8 @@ class BulkEditView(GetReturnURLMixin, View): # ManyToManyFields elif isinstance(model_field, ManyToManyField): - getattr(obj, name).set(form.cleaned_data[name]) - + if form.cleaned_data[name].count() > 0: + getattr(obj, name).set(form.cleaned_data[name]) # Normal fields elif form.cleaned_data[name] not in (None, ''): setattr(obj, name, form.cleaned_data[name]) From 8c4add38f45df9aecf03418f04ef970636f4bf37 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 23 Jul 2020 10:17:57 -0400 Subject: [PATCH 2/4] Update release instructions --- docs/development/release-checklist.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/development/release-checklist.md b/docs/development/release-checklist.md index d924d2c0b..8fe86af80 100644 --- a/docs/development/release-checklist.md +++ b/docs/development/release-checklist.md @@ -41,7 +41,14 @@ Create a file at `/docs/release-notes/X.Y.md` to establish the release notes for ### Manually Perform a New Install -Create a new installation of NetBox by following [the current documentation](http://netbox.readthedocs.io/en/latest/). This should be a manual process, so that issues with the documentation can be identified and corrected. +Install `mkdocs` in your local environment, then start the documentation server: + +```no-highlight +$ pip install -r docs/requirements.txt +$ mkdocs serve +``` + +Follow these instructions to perform a new installation of NetBox. This process must _not_ be automated: The goal of this step is to catch any errors or omissions in the documentation, and ensure that it is kept up-to-date for each release. Make any necessary changes to the documentation before proceeding with the release. ### Close the Release Milestone From 3fd3c7a383bffe46e2c4ee475b0bd936cf7bb6ab Mon Sep 17 00:00:00 2001 From: Josh VanDeraa Date: Thu, 23 Jul 2020 09:24:02 -0500 Subject: [PATCH 3/4] Removes IP address check for NAPALM in HTML --- netbox/templates/dcim/device.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index ef1a301e2..ebeda4b80 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -108,8 +108,6 @@ {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No platform assigned to this device' %} {% elif not device.platform.napalm_driver %} {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No NAPALM driver assigned for this platform' %} - {% elif not device.primary_ip %} - {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No primary IP address assigned to this device' %} {% else %} {% include 'dcim/inc/device_napalm_tabs.html' %} {% endif %} From a262a8320b5a38a21f828bb3649c9d738cd462e0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 23 Jul 2020 13:13:49 -0400 Subject: [PATCH 4/4] Changelog for #4887 --- docs/release-notes/version-2.8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/version-2.8.md b/docs/release-notes/version-2.8.md index 35f91a94d..774de491a 100644 --- a/docs/release-notes/version-2.8.md +++ b/docs/release-notes/version-2.8.md @@ -7,6 +7,7 @@ * [#4875](https://github.com/netbox-community/netbox/issues/4875) - Fix documentation for image attachments * [#4876](https://github.com/netbox-community/netbox/issues/4876) - Fix labels for sites in staging or decommissioning status * [#4880](https://github.com/netbox-community/netbox/issues/4880) - Fix remove tagged vlans if not assigned in bulk interface editting +* [#4887](https://github.com/netbox-community/netbox/issues/4887) - Don't disable NAPALM tabs when device has no primary IP ---