NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-15 19:52:52 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'develop' into 7113-fix-prefix-iprange-bulkedit

Browse Source
This commit is contained in:
Jeremy Stretch 2021-09-01 10:55:52 -04:00 committed by GitHub
commit 9772c5705f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.0.md
View File

@ -23,6 +23,7 @@
* [#7101](https://github.com/netbox-community/netbox/issues/7101) - Enforce `MAX_PAGE_SIZE` for table and REST API pagination * [#7101](https://github.com/netbox-community/netbox/issues/7101) - Enforce `MAX_PAGE_SIZE` for table and REST API pagination
* [#7106](https://github.com/netbox-community/netbox/issues/7106) - Fix incorrect "Map It" button URL on a site's Physical Address field * [#7106](https://github.com/netbox-community/netbox/issues/7106) - Fix incorrect "Map It" button URL on a site's Physical Address field
* [#7107](https://github.com/netbox-community/netbox/issues/7107) - Fix missing search button and search results in IP Address assignment "Assign IP" tab * [#7107](https://github.com/netbox-community/netbox/issues/7107) - Fix missing search button and search results in IP Address assignment "Assign IP" tab
* [#7109](https://github.com/netbox-community/netbox/issues/7109) - Ensure human readability of exceptions raised during REST API requests
* [#7113](https://github.com/netbox-community/netbox/issues/7113) - Fix IPRange bulk options within Prefix view * [#7113](https://github.com/netbox-community/netbox/issues/7113) - Fix IPRange bulk options within Prefix view
--- ---

8
netbox/netbox/middleware.py
View File

@ -113,6 +113,10 @@ class ExceptionHandlingMiddleware(object):
def process_exception(self, request, exception): def process_exception(self, request, exception):
# Handle exceptions that occur from REST API requests
if is_api_request(request):
return rest_api_server_error(request)
# Don't catch exceptions when in debug mode # Don't catch exceptions when in debug mode
if settings.DEBUG: if settings.DEBUG:
return return
@ -121,10 +125,6 @@ class ExceptionHandlingMiddleware(object):
if isinstance(exception, Http404): if isinstance(exception, Http404):
return return
# Handle exceptions that occur from REST API requests
if is_api_request(request):
return rest_api_server_error(request)
# Determine the type of exception. If it's a common issue, return a custom error page with instructions. # Determine the type of exception. If it's a common issue, return a custom error page with instructions.
custom_template = None custom_template = None
if isinstance(exception, ProgrammingError): if isinstance(exception, ProgrammingError):

2
netbox/templates/base/base.html
View File

@ -5,7 +5,7 @@
<html <html
lang="en" lang="en"
data-netbox-path="{{ request.path }}" data-netbox-path="{{ request.path }}"
data-netbox-base-path="{% base_path %}" data-netbox-base-path="{{ settings.BASE_PATH }}"
{% if preferences|get_key:'ui.colormode' == 'dark'%} {% if preferences|get_key:'ui.colormode' == 'dark'%}
data-netbox-color-mode="dark" data-netbox-color-mode="dark"
{% else %} {% else %}

3
netbox/utilities/api.py
View File

@ -48,7 +48,8 @@ def is_api_request(request):
Return True of the request is being made via the REST API. Return True of the request is being made via the REST API.
""" """
api_path = reverse('api-root') api_path = reverse('api-root')
return request.path_info.startswith(api_path)
return request.path_info.startswith(api_path) and request.content_type == 'application/json'
def get_view_name(view, suffix=None): def get_view_name(view, suffix=None):

8
netbox/utilities/templatetags/helpers.py
View File

@ -355,14 +355,6 @@ def querystring(request, **kwargs):
return '' return ''
@register.simple_tag()
def base_path():
"""
Access `BASE_PATH` in templates.
"""
return settings.BASE_PATH
@register.inclusion_tag('utilities/templatetags/utilization_graph.html') @register.inclusion_tag('utilities/templatetags/utilization_graph.html')
def utilization_graph(utilization, warning_threshold=75, danger_threshold=90): def utilization_graph(utilization, warning_threshold=75, danger_threshold=90):
""" """