From b3423e1722deee0d68abd35949e0ef4023dba81e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 25 May 2021 11:38:43 -0400 Subject: [PATCH] Release v2.11.4 --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- docs/release-notes/version-2.11.md | 2 +- netbox/netbox/settings.py | 2 +- netbox/utilities/tables.py | 14 -------------- requirements.txt | 6 +++--- 6 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index adbfba419..9af9647f0 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -17,7 +17,7 @@ body: What version of NetBox are you currently running? (If you don't have access to the most recent NetBox release, consider testing on our [demo instance](https://demo.netbox.dev/) before opening a bug report to see if your issue has already been addressed.) - placeholder: v2.11.3 + placeholder: v2.11.4 validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 9181f7ce4..b6e53491e 100644 --- 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: v2.11.3 + placeholder: v2.11.4 validations: required: true - type: dropdown diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index e7c0ab304..4a0fcef8f 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -1,6 +1,6 @@ # NetBox v2.11 -## v2.11.4 (FUTURE) +## v2.11.4 (2021-05-25) ### Enhancements diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index f2e6f6e72..4f694c388 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -16,7 +16,7 @@ from django.core.validators import URLValidator # Environment setup # -VERSION = '2.11.4-dev' +VERSION = '2.11.4' # Hostname HOSTNAME = platform.node() diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index 78e1f6d53..86660c2e5 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -5,7 +5,6 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import FieldDoesNotExist from django.db.models.fields.related import RelatedField from django.urls import reverse -from django.utils.html import strip_tags from django.utils.safestring import mark_safe from django_tables2 import RequestConfig from django_tables2.data import TableQuerysetData @@ -15,19 +14,6 @@ from extras.models import CustomField from .paginator import EnhancedPaginator, get_paginate_count -def stripped_value(self, **kwargs): - """ - Replaces TemplateColumn's value() method to both strip HTML tags and remove any leading/trailing whitespace. - """ - html = super(tables.TemplateColumn, self).value(**kwargs) - return strip_tags(html).strip() if isinstance(html, str) else html - - -# TODO: We're monkey-patching TemplateColumn here to strip leading/trailing whitespace. This will no longer -# be necessary under django-tables2 v2.3.5+. (See #5926) -tables.TemplateColumn.value = stripped_value - - class BaseTable(tables.Table): """ Default table for object lists diff --git a/requirements.txt b/requirements.txt index f7ae8178d..904563d05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==3.2.2 +Django==3.2.3 django-cacheops==6.0 django-cors-headers==3.7.0 django-debug-toolbar==3.2.1 @@ -7,13 +7,13 @@ django-mptt==0.12.0 django-pglocks==1.0.4 django-prometheus==2.1.0 django-rq==2.4.1 -django-tables2==2.3.4 +django-tables2==2.4.0 django-taggit==1.4.0 django-timezone-field==4.1.2 djangorestframework==3.12.4 drf-yasg[validation]==1.20.0 gunicorn==20.1.0 -Jinja2==2.11.3 +Jinja2==3.0.1 Markdown==3.3.4 netaddr==0.8.0 Pillow==8.2.0