diff --git a/netbox/users/forms/bulk_import.py b/netbox/users/forms/bulk_import.py index 060d771ee..08b9b91fd 100644 --- a/netbox/users/forms/bulk_import.py +++ b/netbox/users/forms/bulk_import.py @@ -9,22 +9,10 @@ from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugFiel __all__ = ( 'GroupImportForm', 'ObjectPermissionImportForm', - 'UserImportForm', ) -class UserImportForm(NetBoxModelImportForm): - slug = SlugField() - - class Meta: - model = NetBoxUser - fields = ( - 'email', - ) - - class GroupImportForm(NetBoxModelImportForm): - slug = SlugField() class Meta: model = NetBoxGroup diff --git a/netbox/users/urls.py b/netbox/users/urls.py index fd248993a..9edecd8c0 100644 --- a/netbox/users/urls.py +++ b/netbox/users/urls.py @@ -14,7 +14,6 @@ urlpatterns = [ # Users path('users/', views.NetBoxUserListView.as_view(), name='netboxuser_list'), path('users/add/', views.NetBoxUserEditView.as_view(), name='netboxuser_add'), - path('users/import/', views.NetBoxUserBulkImportView.as_view(), name='netboxuser_import'), path('users/edit/', views.NetBoxUserBulkEditView.as_view(), name='netboxuser_bulk_edit'), path('users/delete/', views.NetBoxUserBulkDeleteView.as_view(), name='netboxuser_bulk_delete'), path('users//', include(get_model_urls('users', 'netboxuser'))), @@ -23,7 +22,6 @@ urlpatterns = [ path('groups/', views.NetBoxGroupListView.as_view(), name='netboxgroup_list'), path('groups/add/', views.NetBoxGroupEditView.as_view(), name='netboxgroup_add'), path('groups/import/', views.NetBoxGroupBulkImportView.as_view(), name='netboxgroup_import'), - # path('groups/edit/', views.NetBoxGroupBulkEditView.as_view(), name='netboxgroup_bulk_edit'), path('groups/delete/', views.NetBoxGroupBulkDeleteView.as_view(), name='netboxgroup_bulk_delete'), path('groups//', include(get_model_urls('users', 'netboxgroup'))), diff --git a/netbox/users/views.py b/netbox/users/views.py index 403f66ab7..26e4895ee 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -399,26 +399,6 @@ class NetBoxUserDeleteView(generic.ObjectDeleteView): return get_permission_for_model(User, 'delete') -class NetBoxUserBulkImportView(generic.BulkImportView): - queryset = NetBoxUser.objects.all() - model_form = forms.UserImportForm - - def get_required_permission(self): - return get_permission_for_model(User, 'add') - - def dispatch(self, request, *args, **kwargs): - # breakpoint() - return super().dispatch(request, *args, **kwargs) - - def get(self, request, *args, **kwargs): - # breakpoint() - return super().get(request, *args, **kwargs) - - def post(self, request, *args, **kwargs): - # breakpoint() - return super().post(request, *args, **kwargs) - - class NetBoxUserBulkEditView(generic.BulkEditView): queryset = NetBoxUser.objects.all() filterset = filtersets.UserFilterSet diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py index b5ea5a17e..fd7ffb757 100644 --- a/netbox/utilities/testing/views.py +++ b/netbox/utilities/testing/views.py @@ -987,3 +987,33 @@ class ViewTestCases: TestCase suitable for testing device component models (ConsolePorts, Interfaces, etc.) """ maxDiff = None + + class UserViewTestCase( + GetObjectViewTestCase, + GetObjectChangelogViewTestCase, + CreateObjectViewTestCase, + EditObjectViewTestCase, + DeleteObjectViewTestCase, + ListObjectsViewTestCase, + BulkEditObjectsViewTestCase, + BulkDeleteObjectsViewTestCase, + ): + """ + TestCase suitable for testing all standard View functions for auth.user objects + """ + maxDiff = None + + class GroupViewTestCase( + GetObjectViewTestCase, + GetObjectChangelogViewTestCase, + CreateObjectViewTestCase, + EditObjectViewTestCase, + DeleteObjectViewTestCase, + ListObjectsViewTestCase, + BulkImportObjectsViewTestCase, + BulkDeleteObjectsViewTestCase, + ): + """ + TestCase suitable for testing all standard View functions for auth.group objects + """ + maxDiff = None