MFH: r522268 r522343

net-mgmt/netbox: Update to 2.6.11

* Remove the patch that fixed a regression when accessing the API
  documentation as it's no longer required. [1]

Changelog since 2.6.9:

Enhancements:
* Add ability to move inventory items between devices
* Extend admin UI to allow deleting old report results
* Add assigned_to_interface filter for IP addresses
* Fail gracefully on custom link rendering exception
* Provide request context when executing custom scripts
* Add date/time picker widgets
* Enable partial search for inventory items
* Optimize size of pages containing a dynamic selection field
* Allow filtering console/power/interface connections by device ID

Bug Fixes:
* Restrict queryset of chained fields when form validation fails
* Include A/Z termination sites for circuits in global search
* Scrolling to target (hash) did not account for the header size
* Fix AttributeError exception in API docs [1]
* Filter platform by manufacturer when editing devices
* Fix filtering of racks by group on device list
* Fix exception when editing a device bay (regression since 2.6.7)
* Fix API-driven filter field rendering (regression since 2.6.10)
* Add missing region filters for multiple objects

https://github.com/netbox-community/netbox/releases/tag/v2.6.11
https://github.com/netbox-community/netbox/releases/tag/v2.6.10

net-mgmt/netbox: Relax RUN_DEPENDS

* The 2020Q1 branch has 0.24.0 of www/py-dj22-django-taggit thus relax
  its version requirement of the RUN_DEPENDS to avoid a build failure there.

  Although net-mgmt/netbox requires the 1.1.0 release of
  www/py-dj22-django-taggit (pinned with "==" by upstream), it runs fine
  with either 0.24.0 (in 2020Q1) or 1.2.0 (since r521999).

Approved by:	ports-secteam (joneum)
		ports-secteam build fix blanket (remaining part)
This commit is contained in:
Kai Knoblich 2020-01-07 16:30:51 +00:00
parent 31f5db3971
commit 87e0efa37e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2020Q1/; revision=522344
4 changed files with 11 additions and 22 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= netbox
DISTVERSIONPREFIX= v
DISTVERSION= 2.6.9
DISTVERSION= 2.6.11
CATEGORIES= net-mgmt
MAINTAINER= kai@FreeBSD.org

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1576569679
SHA256 (netbox-community-netbox-v2.6.9_GH0.tar.gz) = 82b993a4002ad68f0d572591f81958aa88a37244c9d76646c01c210fdd57bdb9
SIZE (netbox-community-netbox-v2.6.9_GH0.tar.gz) = 2417598
TIMESTAMP = 1578134297
SHA256 (netbox-community-netbox-v2.6.11_GH0.tar.gz) = 7d395f8b9fdffdce162030f117d36258aa478c72ca6612b82b3e98c6d397c89d
SIZE (netbox-community-netbox-v2.6.11_GH0.tar.gz) = 2440647

View File

@ -1,18 +0,0 @@
Fix AttributeError exception in API docs when accessing api/docs
Obtained from:
https://github.com/netbox-community/netbox/commit/55b503da5bdf2a95e903fb657ade195ff89cae91
--- netbox/extras/api/customfields.py.orig 2019-12-16 21:32:00 UTC
+++ netbox/extras/api/customfields.py
@@ -124,6 +124,9 @@ class CustomFieldModelSerializer(ValidatedModelSeriali
else:
+ if not hasattr(self, 'initial_data'):
+ self.initial_data = {}
+
# Populate default values
if fields and 'custom_fields' not in self.initial_data:
self.initial_data['custom_fields'] = {}

View File

@ -46,6 +46,7 @@
%%PORTDOCS%%%%DOCSDIR%%/media/screenshot2.png
%%PORTDOCS%%%%DOCSDIR%%/media/screenshot3.png
%%PORTDOCS%%%%DOCSDIR%%/netbox_logo.png
%%PORTDOCS%%%%DOCSDIR%%/netbox_logo.svg
%%PORTDOCS%%%%DOCSDIR%%/release-notes/index.md
%%PORTDOCS%%%%DOCSDIR%%/release-notes/version-1.0.md
%%PORTDOCS%%%%DOCSDIR%%/release-notes/version-1.1.md
@ -359,6 +360,9 @@
%%DATADIR%%/project-static/bootstrap-3.4.1-dist/js/npm.js
%%DATADIR%%/project-static/clipboard-2.0.4.min.js
%%DATADIR%%/project-static/css/base.css
%%DATADIR%%/project-static/flatpickr-4.6.3/flatpickr.min.js
%%DATADIR%%/project-static/flatpickr-4.6.3/themes/dark.css
%%DATADIR%%/project-static/flatpickr-4.6.3/themes/light.css
%%DATADIR%%/project-static/font-awesome-4.7.0/css/font-awesome.css
%%DATADIR%%/project-static/font-awesome-4.7.0/css/font-awesome.min.css
%%DATADIR%%/project-static/font-awesome-4.7.0/fonts/FontAwesome.otf
@ -397,7 +401,9 @@
%%DATADIR%%/project-static/font-awesome-4.7.0/scss/font-awesome.scss
%%DATADIR%%/project-static/img/ajax-loader.gif
%%DATADIR%%/project-static/img/netbox.ico
%%DATADIR%%/project-static/img/netbox_icon.svg
%%DATADIR%%/project-static/img/netbox_logo.png
%%DATADIR%%/project-static/img/netbox_logo.svg
%%DATADIR%%/project-static/img/tint_20.png
%%DATADIR%%/project-static/jquery-ui-1.12.1/AUTHORS.txt
%%DATADIR%%/project-static/jquery-ui-1.12.1/LICENSE.txt
@ -793,6 +799,7 @@
%%DATADIR%%/utilities/templates/buttons/export.html
%%DATADIR%%/utilities/templates/buttons/import.html
%%DATADIR%%/utilities/templates/widgets/colorselect_option.html
%%DATADIR%%/utilities/templates/widgets/select_api.html
%%DATADIR%%/utilities/templates/widgets/select_contenttype.html
%%DATADIR%%/utilities/templates/widgets/select_option_with_pk.html
%%DATADIR%%/utilities/templates/widgets/selectwithdisabled_option.html