From 07a53c8315456408a51d3b2d7cc3a3f510a63094 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 19 Sep 2025 15:52:16 -0400
Subject: [PATCH] Closes #17010: Show admin navigation menu items only for
 staff & superusers (#20386)

---
 netbox/netbox/navigation/menu.py            | 18 +++++++++---------
 netbox/utilities/templatetags/navigation.py |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py
index c4aac5bfe..ac4c2b492 100644
--- a/netbox/netbox/navigation/menu.py
+++ b/netbox/netbox/navigation/menu.py
@@ -412,7 +412,7 @@ ADMIN_MENU = Menu(
                 MenuItem(
                     link='users:user_list',
                     link_text=_('Users'),
-                    auth_required=True,
+                    staff_only=True,
                     permissions=['users.view_user'],
                     buttons=(
                         MenuItemButton(
@@ -432,7 +432,7 @@ ADMIN_MENU = Menu(
                 MenuItem(
                     link='users:group_list',
                     link_text=_('Groups'),
-                    auth_required=True,
+                    staff_only=True,
                     permissions=['users.view_group'],
                     buttons=(
                         MenuItemButton(
@@ -452,14 +452,14 @@ ADMIN_MENU = Menu(
                 MenuItem(
                     link='users:token_list',
                     link_text=_('API Tokens'),
-                    auth_required=True,
+                    staff_only=True,
                     permissions=['users.view_token'],
                     buttons=get_model_buttons('users', 'token')
                 ),
                 MenuItem(
                     link='users:objectpermission_list',
                     link_text=_('Permissions'),
-                    auth_required=True,
+                    staff_only=True,
                     permissions=['users.view_objectpermission'],
                     buttons=get_model_buttons('users', 'objectpermission', actions=['add'])
                 ),
@@ -471,23 +471,23 @@ ADMIN_MENU = Menu(
                 MenuItem(
                     link='core:system',
                     link_text=_('System'),
-                    auth_required=True
+                    staff_only=True,
                 ),
                 MenuItem(
                     link='core:plugin_list',
                     link_text=_('Plugins'),
-                    auth_required=True
+                    staff_only=True,
                 ),
                 MenuItem(
                     link='core:configrevision_list',
                     link_text=_('Configuration History'),
-                    auth_required=True,
-                    permissions=['core.view_configrevision']
+                    staff_only=True,
+                    permissions=['core.view_configrevision'],
                 ),
                 MenuItem(
                     link='core:background_queue_list',
                     link_text=_('Background Tasks'),
-                    auth_required=True
+                    staff_only=True,
                 ),
             ),
         ),
diff --git a/netbox/utilities/templatetags/navigation.py b/netbox/utilities/templatetags/navigation.py
index 176996aa1..6f942fd20 100644
--- a/netbox/utilities/templatetags/navigation.py
+++ b/netbox/utilities/templatetags/navigation.py
@@ -30,7 +30,7 @@ def nav(context):
                     continue
                 if not user.has_perms(item.permissions):
                     continue
-                if item.staff_only and not user.is_staff:
+                if item.staff_only and not any([user.is_staff, user.is_superuser]):
                     continue
                 buttons = [
                     button for button in item.buttons if user.has_perms(button.permissions)