diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 70436129d..f5b605ccd 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -22,7 +22,6 @@ from utilities.error_handlers import handle_protectederror from utilities.exceptions import AbortRequest, AbortTransaction, PermissionsViolation from utilities.forms import BulkRenameForm, ConfirmationForm, restrict_form_fields from utilities.forms.bulk_import import BulkImportForm -from utilities.htmx import is_embedded from utilities.permissions import get_permission_for_model from utilities.utils import get_viewname from utilities.views import GetReturnURLMixin @@ -163,7 +162,7 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): # If this is an HTMX request, return only the rendered table HTML if request.htmx: - if is_embedded(request): + if request.htmx.target != 'object_list': table.embedded = True # Hide selection checkboxes if 'pk' in table.base_columns: diff --git a/netbox/utilities/htmx.py b/netbox/utilities/htmx.py deleted file mode 100644 index d85d817cf..000000000 --- a/netbox/utilities/htmx.py +++ /dev/null @@ -1,16 +0,0 @@ -from urllib.parse import urlparse - -__all__ = ( - 'is_embedded', -) - - -def is_embedded(request): - """ - Returns True if the request indicates that it originates from a URL different from - the path being requested. - """ - hx_current_url = request.headers.get('HX-Current-URL', None) - if not hx_current_url: - return False - return request.path != urlparse(hx_current_url).path