Преглед изворни кода

#10608: Use register_model_view() for token views

jeremystretch пре 3 година
родитељ
комит
96818cacf0
2 измењених фајлова са 9 додато и 3 уклоњено
  1. 6 3
      netbox/users/urls.py
  2. 3 0
      netbox/users/views.py

+ 6 - 3
netbox/users/urls.py

@@ -1,16 +1,19 @@
-from django.urls import path
+from django.urls import include, path
 
 
+from utilities.urls import get_model_urls
 from . import views
 from . import views
 
 
 app_name = 'users'
 app_name = 'users'
 urlpatterns = [
 urlpatterns = [
 
 
+    # User
     path('profile/', views.ProfileView.as_view(), name='profile'),
     path('profile/', views.ProfileView.as_view(), name='profile'),
     path('preferences/', views.UserConfigView.as_view(), name='preferences'),
     path('preferences/', views.UserConfigView.as_view(), name='preferences'),
     path('password/', views.ChangePasswordView.as_view(), name='change_password'),
     path('password/', views.ChangePasswordView.as_view(), name='change_password'),
+
+    # API tokens
     path('api-tokens/', views.TokenListView.as_view(), name='token_list'),
     path('api-tokens/', views.TokenListView.as_view(), name='token_list'),
     path('api-tokens/add/', views.TokenEditView.as_view(), name='token_add'),
     path('api-tokens/add/', views.TokenEditView.as_view(), name='token_add'),
-    path('api-tokens/<int:pk>/edit/', views.TokenEditView.as_view(), name='token_edit'),
-    path('api-tokens/<int:pk>/delete/', views.TokenDeleteView.as_view(), name='token_delete'),
+    path('api-tokens/<int:pk>/', include(get_model_urls('users', 'token'))),
 
 
 ]
 ]

+ 3 - 0
netbox/users/views.py

@@ -20,6 +20,7 @@ from extras.tables import ObjectChangeTable
 from netbox.authentication import get_auth_backend_display, get_saml_idps
 from netbox.authentication import get_auth_backend_display, get_saml_idps
 from netbox.config import get_config
 from netbox.config import get_config
 from utilities.forms import ConfirmationForm
 from utilities.forms import ConfirmationForm
+from utilities.views import register_model_view
 from .forms import LoginForm, PasswordChangeForm, TokenForm, UserConfigForm
 from .forms import LoginForm, PasswordChangeForm, TokenForm, UserConfigForm
 from .models import Token, UserConfig
 from .models import Token, UserConfig
 from .tables import TokenTable
 from .tables import TokenTable
@@ -246,6 +247,7 @@ class TokenListView(LoginRequiredMixin, View):
         })
         })
 
 
 
 
+@register_model_view(Token, 'edit')
 class TokenEditView(LoginRequiredMixin, View):
 class TokenEditView(LoginRequiredMixin, View):
 
 
     def get(self, request, pk=None):
     def get(self, request, pk=None):
@@ -300,6 +302,7 @@ class TokenEditView(LoginRequiredMixin, View):
         })
         })
 
 
 
 
+@register_model_view(Token, 'delete')
 class TokenDeleteView(LoginRequiredMixin, View):
 class TokenDeleteView(LoginRequiredMixin, View):
 
 
     def get(self, request, pk):
     def get(self, request, pk):