From 53ec3d43e7cfe4e691c391d24487e9a1ff2f7394 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 21 Jul 2023 15:53:55 +0700 Subject: [PATCH] 13044 fix urls and restrictedqueryset --- netbox/netbox/navigation/menu.py | 2 +- netbox/users/models.py | 2 ++ netbox/users/urls.py | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py index beb4cab0c..0398c1a11 100644 --- a/netbox/netbox/navigation/menu.py +++ b/netbox/netbox/navigation/menu.py @@ -416,7 +416,7 @@ ADMIN_MENU = Menu( label=_('Users'), items=( MenuItem( - link='users:user_token_list', + link='users:usertoken_list', link_text=_('Tokens'), permissions=['users.view_token'] ), diff --git a/netbox/users/models.py b/netbox/users/models.py index a004b6c74..75d7a515b 100644 --- a/netbox/users/models.py +++ b/netbox/users/models.py @@ -325,11 +325,13 @@ class UserToken(Token): def get_absolute_url(self): return reverse('users:usertoken', args=[self.pk]) + objects = RestrictedQuerySet.as_manager() # # Permissions # + class ObjectPermission(models.Model): """ A mapping of view, add, change, and/or delete permission for users and/or groups to an arbitrary set of objects diff --git a/netbox/users/urls.py b/netbox/users/urls.py index ef178d099..787f95d59 100644 --- a/netbox/users/urls.py +++ b/netbox/users/urls.py @@ -16,12 +16,12 @@ urlpatterns = [ path('api-tokens//', include(get_model_urls('users', 'token'))), # Tokens - path('user-tokens/', views.UserTokenListView.as_view(), name='user_token_list'), - path('user-tokens/add/', views.UserTokenEditView.as_view(), name='user_token_add'), - path('user-tokens/import/', views.UserTokenBulkImportView.as_view(), name='user_token_import'), - path('user-tokens/edit/', views.UserTokenBulkEditView.as_view(), name='user_token_bulk_edit'), - path('user-tokens/delete/', views.UserTokenBulkDeleteView.as_view(), name='user_token_bulk_delete'), - path('user-tokens//', include(get_model_urls('users', 'user_token'))), + path('user-tokens/', views.UserTokenListView.as_view(), name='usertoken_list'), + path('user-tokens/add/', views.UserTokenEditView.as_view(), name='usertoken_add'), + path('user-tokens/import/', views.UserTokenBulkImportView.as_view(), name='usertoken_import'), + path('user-tokens/edit/', views.UserTokenBulkEditView.as_view(), name='user_tokenbulk_edit'), + path('user-tokens/delete/', views.UserTokenBulkDeleteView.as_view(), name='usertoken_bulk_delete'), + path('user-tokens//', include(get_model_urls('users', 'usertoken'))), # Users path('users/', views.UserListView.as_view(), name='netboxuser_list'),