mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-08 08:38:16 -06:00
16992 remove TODO for NetBox 4.1
This commit is contained in:
parent
e62a42286a
commit
ad6042b80a
@ -139,11 +139,6 @@ urlpatterns = [
|
|||||||
path('scripts/<int:pk>/jobs/', views.ScriptJobsView.as_view(), name='script_jobs'),
|
path('scripts/<int:pk>/jobs/', views.ScriptJobsView.as_view(), name='script_jobs'),
|
||||||
path('script-modules/<int:pk>/', include(get_model_urls('extras', 'scriptmodule'))),
|
path('script-modules/<int:pk>/', include(get_model_urls('extras', 'scriptmodule'))),
|
||||||
|
|
||||||
# Redirects for legacy script URLs
|
|
||||||
# TODO: Remove in NetBox v4.1
|
|
||||||
path('scripts/<str:module>/<str:name>/', views.LegacyScriptRedirectView.as_view()),
|
|
||||||
path('scripts/<str:module>/<str:name>/<path:path>/', views.LegacyScriptRedirectView.as_view()),
|
|
||||||
|
|
||||||
# Markdown
|
# Markdown
|
||||||
path('render/markdown/', views.RenderMarkdownView.as_view(), name="render_markdown"),
|
path('render/markdown/', views.RenderMarkdownView.as_view(), name="render_markdown"),
|
||||||
]
|
]
|
||||||
|
@ -123,13 +123,7 @@ class CustomValidator:
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Execute custom validation logic (if any)
|
# Execute custom validation logic (if any)
|
||||||
# TODO: Remove in v4.1
|
self.validate(instance)
|
||||||
# Inspect the validate() method, which may have been overridden, to determine
|
|
||||||
# whether we should pass the request (maintains backward compatibility for pre-v4.0)
|
|
||||||
if 'request' in inspect.signature(self.validate).parameters:
|
|
||||||
self.validate(instance, request)
|
|
||||||
else:
|
|
||||||
self.validate(instance)
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _get_request_attr(request, name):
|
def _get_request_attr(request, name):
|
||||||
|
@ -1,7 +1,3 @@
|
|||||||
# Prefix for nested serializers
|
|
||||||
# TODO: Remove in v4.1
|
|
||||||
NESTED_SERIALIZER_PREFIX = 'Nested'
|
|
||||||
|
|
||||||
# RQ queue names
|
# RQ queue names
|
||||||
RQ_QUEUE_DEFAULT = 'default'
|
RQ_QUEUE_DEFAULT = 'default'
|
||||||
RQ_QUEUE_HIGH = 'high'
|
RQ_QUEUE_HIGH = 'high'
|
||||||
|
@ -113,11 +113,6 @@ class DynamicModelChoiceMixin:
|
|||||||
for var, accessor in self.context.items():
|
for var, accessor in self.context.items():
|
||||||
attrs[f'ts-{var}-field'] = accessor
|
attrs[f'ts-{var}-field'] = accessor
|
||||||
|
|
||||||
# TODO: Remove in v4.1
|
|
||||||
# Legacy means of specifying the disabled indicator
|
|
||||||
if self.disabled_indicator is not None:
|
|
||||||
attrs['ts-disabled-field'] = self.disabled_indicator
|
|
||||||
|
|
||||||
# Attach any static query parameters
|
# Attach any static query parameters
|
||||||
if len(self.query_params) > 0:
|
if len(self.query_params) > 0:
|
||||||
widget.add_query_params(self.query_params)
|
widget.add_query_params(self.query_params)
|
||||||
|
@ -54,15 +54,6 @@ def render_fieldset(form, fieldset):
|
|||||||
"""
|
"""
|
||||||
Render a group set of fields.
|
Render a group set of fields.
|
||||||
"""
|
"""
|
||||||
# TODO: Remove in NetBox v4.1
|
|
||||||
# Handle legacy tuple-based fieldset definitions, e.g. (_('Label'), ('field1, 'field2', 'field3'))
|
|
||||||
if type(fieldset) is not FieldSet:
|
|
||||||
warnings.warn(
|
|
||||||
f"{form.__class__} fieldsets contains a non-FieldSet item: {fieldset}"
|
|
||||||
)
|
|
||||||
name, fields = fieldset
|
|
||||||
fieldset = FieldSet(*fields, name=name)
|
|
||||||
|
|
||||||
rows = []
|
rows = []
|
||||||
for item in fieldset.items:
|
for item in fieldset.items:
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user