From 4d85e9ce340e2184e7da16bf15073852caaf3d74 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 18 Mar 2024 17:03:49 -0400 Subject: [PATCH] Enable HTMX navigation only when selected by user --- netbox/netbox/context_processors.py | 4 +++- netbox/templates/base/layout.html | 2 +- netbox/templates/dcim/component_list.html | 2 +- .../dcim/device/components_base.html | 6 ++---- .../templates/dcim/device/consoleports.html | 3 +-- .../dcim/device/consoleserverports.html | 3 +-- netbox/templates/dcim/device/frontports.html | 3 +-- netbox/templates/dcim/device/interfaces.html | 3 +-- .../templates/dcim/device/poweroutlets.html | 3 +-- netbox/templates/dcim/device/powerports.html | 3 +-- netbox/templates/dcim/device/rearports.html | 3 +-- netbox/templates/dcim/device_list.html | 20 +++++++++---------- .../dcim/devicetype/component_templates.html | 6 ++---- .../dcim/moduletype/component_templates.html | 6 +++--- netbox/templates/dcim/powerpanel.html | 6 +++--- .../templates/extras/configcontext_list.html | 2 +- .../templates/extras/configtemplate_list.html | 2 +- .../templates/extras/exporttemplate_list.html | 2 +- netbox/templates/generic/object_children.html | 6 ++---- .../virtualization/cluster/devices.html | 3 +-- .../virtualmachine/interfaces.html | 3 +-- .../virtualmachine/virtual_disks.html | 3 +-- .../virtualization/virtualmachine_list.html | 4 ++-- .../templates/buttons/bulk_delete.html | 2 +- .../templates/buttons/bulk_edit.html | 2 +- .../utilities/templates/navigation/menu.html | 2 +- .../utilities/templatetags/builtins/tags.py | 12 +++++++++++ 27 files changed, 57 insertions(+), 59 deletions(-) diff --git a/netbox/netbox/context_processors.py b/netbox/netbox/context_processors.py index 024ca85b5..ce4f8c45e 100644 --- a/netbox/netbox/context_processors.py +++ b/netbox/netbox/context_processors.py @@ -8,9 +8,11 @@ def settings_and_registry(request): """ Expose Django settings and NetBox registry stores in the template context. Example: {{ settings.DEBUG }} """ + user_preferences = request.user.config if request.user.is_authenticated else {} return { 'settings': django_settings, 'config': get_config(), 'registry': registry, - 'preferences': request.user.config if request.user.is_authenticated else {}, + 'preferences': user_preferences, + 'htmx_navigation': user_preferences.get('ui.htmx_navigation', False) == 'true' } diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index 943ec9dbf..e154254b5 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -79,7 +79,7 @@ Blocks: {# Page content #}
-
+
{# Page header #} {% block header %} diff --git a/netbox/templates/dcim/component_list.html b/netbox/templates/dcim/component_list.html index 089f161e7..3d261ea4d 100644 --- a/netbox/templates/dcim/component_list.html +++ b/netbox/templates/dcim/component_list.html @@ -10,7 +10,7 @@ {% endif %} {% if 'bulk_rename' in actions %} {% with bulk_rename_view=model|validated_viewname:"bulk_rename" %} - {% endwith %} diff --git a/netbox/templates/dcim/device/components_base.html b/netbox/templates/dcim/device/components_base.html index c6f68439b..47b0d7aab 100644 --- a/netbox/templates/dcim/device/components_base.html +++ b/netbox/templates/dcim/device/components_base.html @@ -5,8 +5,7 @@ {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %} {% if 'bulk_edit' in actions and bulk_edit_view %} @@ -15,8 +14,7 @@ {% with bulk_rename_view=child_model|validated_viewname:"bulk_rename" %} {% if 'bulk_rename' in actions and bulk_rename_view %} diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html index 41116fe84..d8de85868 100644 --- a/netbox/templates/dcim/device/consoleports.html +++ b/netbox/templates/dcim/device/consoleports.html @@ -7,8 +7,7 @@ {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %} {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html index 0284f950d..29efdb65b 100644 --- a/netbox/templates/dcim/device/consoleserverports.html +++ b/netbox/templates/dcim/device/consoleserverports.html @@ -7,8 +7,7 @@ {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %} {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html index 1132aea5e..4d7f14769 100644 --- a/netbox/templates/dcim/device/frontports.html +++ b/netbox/templates/dcim/device/frontports.html @@ -7,8 +7,7 @@ {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %} {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html index 5c47d944d..8d46d77ea 100644 --- a/netbox/templates/dcim/device/interfaces.html +++ b/netbox/templates/dcim/device/interfaces.html @@ -11,8 +11,7 @@ {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %} {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html index 5a9758964..66c765181 100644 --- a/netbox/templates/dcim/device/poweroutlets.html +++ b/netbox/templates/dcim/device/poweroutlets.html @@ -7,8 +7,7 @@ {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %} {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html index 669222b37..a299130a4 100644 --- a/netbox/templates/dcim/device/powerports.html +++ b/netbox/templates/dcim/device/powerports.html @@ -7,8 +7,7 @@ {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %} {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html index 8cf99ccd0..184e80d99 100644 --- a/netbox/templates/dcim/device/rearports.html +++ b/netbox/templates/dcim/device/rearports.html @@ -7,8 +7,7 @@ {% with bulk_disconnect_view=child_model|validated_viewname:"bulk_disconnect" %} {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html index e8bf7b5a0..41ef8fc73 100644 --- a/netbox/templates/dcim/device_list.html +++ b/netbox/templates/dcim/device_list.html @@ -11,63 +11,63 @@
    {% if perms.dcim.add_consoleport %}
  • -
    • {% endif %} {% if perms.dcim.add_consoleserverport %}
  • -
    • {% endif %} {% if perms.dcim.add_powerport %}
  • -
    • {% endif %} {% if perms.dcim.add_poweroutlet %}
  • -
    • {% endif %} {% if perms.dcim.add_interface %}
  • -
    • {% endif %} {% if perms.dcim.add_rearport %}
  • -
    • {% endif %} {% if perms.dcim.add_devicebay %}
  • -
    • {% endif %} {% if perms.dcim.add_modulebay %}
  • -
    • {% endif %} {% if perms.dcim.add_inventoryitem %}
  • -
    • @@ -78,7 +78,7 @@ {% if 'bulk_edit' in actions %}
    {% bulk_edit_button model query_params=request.GET %} -
    diff --git a/netbox/templates/dcim/devicetype/component_templates.html b/netbox/templates/dcim/devicetype/component_templates.html index 63c977c93..df9789c00 100644 --- a/netbox/templates/dcim/devicetype/component_templates.html +++ b/netbox/templates/dcim/devicetype/component_templates.html @@ -7,8 +7,7 @@ {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %} {% if 'bulk_edit' in actions and bulk_edit_view %} @@ -17,8 +16,7 @@ {% with bulk_rename_view=child_model|validated_viewname:"bulk_rename" %} {% if 'bulk_rename' in actions and bulk_rename_view %} diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html index cf49dd00d..d67c6e8fb 100644 --- a/netbox/templates/dcim/moduletype/component_templates.html +++ b/netbox/templates/dcim/moduletype/component_templates.html @@ -13,13 +13,13 @@
{% if table.rows %} - - - {% endif %} diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index d73e251af..8866994fe 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -52,17 +52,17 @@ {% htmx_table 'dcim:powerfeed_list' power_panel_id=object.pk %}
{% if perms.dcim.change_powerfeed %} - {% endif %} {% if perms.dcim.delete_cable %} - {% endif %} {% if perms.dcim.delete_powerfeed %} - {% endif %} diff --git a/netbox/templates/extras/configcontext_list.html b/netbox/templates/extras/configcontext_list.html index 1d1716888..648323532 100644 --- a/netbox/templates/extras/configcontext_list.html +++ b/netbox/templates/extras/configcontext_list.html @@ -3,7 +3,7 @@ {% block bulk_buttons %} {% if perms.extras.sync_configcontext %} - {% endif %} diff --git a/netbox/templates/extras/configtemplate_list.html b/netbox/templates/extras/configtemplate_list.html index ddf1ad23a..c9db67e36 100644 --- a/netbox/templates/extras/configtemplate_list.html +++ b/netbox/templates/extras/configtemplate_list.html @@ -3,7 +3,7 @@ {% block bulk_buttons %} {% if perms.extras.sync_configtemplate %} - {% endif %} diff --git a/netbox/templates/extras/exporttemplate_list.html b/netbox/templates/extras/exporttemplate_list.html index af02e21de..4284336a5 100644 --- a/netbox/templates/extras/exporttemplate_list.html +++ b/netbox/templates/extras/exporttemplate_list.html @@ -3,7 +3,7 @@ {% block bulk_buttons %} {% if perms.extras.sync_configcontext %} - {% endif %} diff --git a/netbox/templates/generic/object_children.html b/netbox/templates/generic/object_children.html index 2b58ce77d..599096ec1 100644 --- a/netbox/templates/generic/object_children.html +++ b/netbox/templates/generic/object_children.html @@ -21,8 +21,7 @@ {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %} {% if 'bulk_edit' in actions and bulk_edit_view %} @@ -36,8 +35,7 @@ {% with bulk_delete_view=child_model|validated_viewname:"bulk_delete" %} {% if 'bulk_delete' in actions and bulk_delete_view %} diff --git a/netbox/templates/virtualization/cluster/devices.html b/netbox/templates/virtualization/cluster/devices.html index 1edbac0a7..a71fab8b5 100644 --- a/netbox/templates/virtualization/cluster/devices.html +++ b/netbox/templates/virtualization/cluster/devices.html @@ -5,8 +5,7 @@ {{ block.super }} {% if 'bulk_remove_devices' in actions %} diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html index da454a709..f74bd9770 100644 --- a/netbox/templates/virtualization/virtualmachine/interfaces.html +++ b/netbox/templates/virtualization/virtualmachine/interfaces.html @@ -6,8 +6,7 @@ {{ block.super }} {% if 'bulk_rename' in actions %} diff --git a/netbox/templates/virtualization/virtualmachine/virtual_disks.html b/netbox/templates/virtualization/virtualmachine/virtual_disks.html index f6a2a9a9c..2637d851a 100644 --- a/netbox/templates/virtualization/virtualmachine/virtual_disks.html +++ b/netbox/templates/virtualization/virtualmachine/virtual_disks.html @@ -6,8 +6,7 @@ {{ block.super }} {% if 'bulk_rename' in actions %} diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html index ec562406e..63fbdc2b7 100644 --- a/netbox/templates/virtualization/virtualmachine_list.html +++ b/netbox/templates/virtualization/virtualmachine_list.html @@ -10,14 +10,14 @@
    {% if perms.virtualization.add_vminterface %}
  • -
    • {% endif %} {% if perms.virtualization.add_virtualdisk %}
  • -
    • diff --git a/netbox/utilities/templates/buttons/bulk_delete.html b/netbox/utilities/templates/buttons/bulk_delete.html index 5a838c68c..a4860ce2d 100644 --- a/netbox/utilities/templates/buttons/bulk_delete.html +++ b/netbox/utilities/templates/buttons/bulk_delete.html @@ -1,6 +1,6 @@ {% load i18n %} {% if url %} - {% endif %} diff --git a/netbox/utilities/templates/buttons/bulk_edit.html b/netbox/utilities/templates/buttons/bulk_edit.html index 99623f61b..a5aa03112 100644 --- a/netbox/utilities/templates/buttons/bulk_edit.html +++ b/netbox/utilities/templates/buttons/bulk_edit.html @@ -1,6 +1,6 @@ {% load i18n %} {% if url %} - {% endif %} diff --git a/netbox/utilities/templates/navigation/menu.html b/netbox/utilities/templates/navigation/menu.html index 362cb5e51..f32e3d678 100644 --- a/netbox/utilities/templates/navigation/menu.html +++ b/netbox/utilities/templates/navigation/menu.html @@ -1,6 +1,6 @@ {% load helpers %} -
      +
        {% for menu, groups in nav_items %}
      • diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py index dc5d75f48..03f2c83ba 100644 --- a/netbox/utilities/templatetags/builtins/tags.py +++ b/netbox/utilities/templatetags/builtins/tags.py @@ -9,6 +9,7 @@ __all__ = ( 'checkmark', 'copy_content', 'customfield_value', + 'formaction', 'tag', ) @@ -114,3 +115,14 @@ def htmx_table(context, viewname, return_url=None, **kwargs): 'viewname': viewname, 'url_params': url_params, } + + +@register.simple_tag(takes_context=True) +def formaction(context): + """ + Replace the 'formaction' attribute on an HTML element with the appropriate HTMX attributes + if HTMX navigation is enabled (per the user's preferences). + """ + if context.get('htmx_navigation', False): + return 'hx-push-url="true" hx-post' + return 'formaction'