1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Release v2.11.4

This commit is contained in:
jeremystretch
2021-05-25 11:38:43 -04:00
parent bfb91fcf10
commit b3423e1722
6 changed files with 7 additions and 21 deletions

View File

@ -17,7 +17,7 @@ body:
What version of NetBox are you currently running? (If you don't have access to the most 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/) 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.) before opening a bug report to see if your issue has already been addressed.)
placeholder: v2.11.3 placeholder: v2.11.4
validations: validations:
required: true required: true
- type: dropdown - type: dropdown

View File

@ -14,7 +14,7 @@ body:
attributes: attributes:
label: NetBox version label: NetBox version
description: What version of NetBox are you currently running? description: What version of NetBox are you currently running?
placeholder: v2.11.3 placeholder: v2.11.4
validations: validations:
required: true required: true
- type: dropdown - type: dropdown

View File

@ -1,6 +1,6 @@
# NetBox v2.11 # NetBox v2.11
## v2.11.4 (FUTURE) ## v2.11.4 (2021-05-25)
### Enhancements ### Enhancements

View File

@ -16,7 +16,7 @@ from django.core.validators import URLValidator
# Environment setup # Environment setup
# #
VERSION = '2.11.4-dev' VERSION = '2.11.4'
# Hostname # Hostname
HOSTNAME = platform.node() HOSTNAME = platform.node()

View File

@ -5,7 +5,6 @@ from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import FieldDoesNotExist from django.core.exceptions import FieldDoesNotExist
from django.db.models.fields.related import RelatedField from django.db.models.fields.related import RelatedField
from django.urls import reverse from django.urls import reverse
from django.utils.html import strip_tags
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django_tables2 import RequestConfig from django_tables2 import RequestConfig
from django_tables2.data import TableQuerysetData from django_tables2.data import TableQuerysetData
@ -15,19 +14,6 @@ from extras.models import CustomField
from .paginator import EnhancedPaginator, get_paginate_count 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): class BaseTable(tables.Table):
""" """
Default table for object lists Default table for object lists

View File

@ -1,4 +1,4 @@
Django==3.2.2 Django==3.2.3
django-cacheops==6.0 django-cacheops==6.0
django-cors-headers==3.7.0 django-cors-headers==3.7.0
django-debug-toolbar==3.2.1 django-debug-toolbar==3.2.1
@ -7,13 +7,13 @@ django-mptt==0.12.0
django-pglocks==1.0.4 django-pglocks==1.0.4
django-prometheus==2.1.0 django-prometheus==2.1.0
django-rq==2.4.1 django-rq==2.4.1
django-tables2==2.3.4 django-tables2==2.4.0
django-taggit==1.4.0 django-taggit==1.4.0
django-timezone-field==4.1.2 django-timezone-field==4.1.2
djangorestframework==3.12.4 djangorestframework==3.12.4
drf-yasg[validation]==1.20.0 drf-yasg[validation]==1.20.0
gunicorn==20.1.0 gunicorn==20.1.0
Jinja2==2.11.3 Jinja2==3.0.1
Markdown==3.3.4 Markdown==3.3.4
netaddr==0.8.0 netaddr==0.8.0
Pillow==8.2.0 Pillow==8.2.0