From 98ac45ec3cd29f80210ce8e7700dbd53fb813c78 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Thu, 22 Jun 2023 16:34:55 -0700
Subject: [PATCH] 12589 fix tests

---
 netbox/netbox/views/generic/bulk_views.py |  1 +
 netbox/users/forms/bulk_edit.py           |  3 +++
 netbox/users/forms/model_forms.py         |  6 +----
 netbox/users/views.py                     | 27 ++++++++++++++++++-----
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py
index e66e79a7a..7bed7c4e9 100644
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -626,6 +626,7 @@ class BulkEditView(GetReturnURLMixin, BaseMultiObjectView):
                     clear_webhooks.send(sender=self)
 
             else:
+                print(f"form errors: {form.errors}")
                 logger.debug("Form validation failed")
 
         else:
diff --git a/netbox/users/forms/bulk_edit.py b/netbox/users/forms/bulk_edit.py
index 9fe16db7b..0bdc65b77 100644
--- a/netbox/users/forms/bulk_edit.py
+++ b/netbox/users/forms/bulk_edit.py
@@ -50,6 +50,9 @@ class UserBulkEditForm(BootstrapMixin, forms.Form):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['pk'].queryset = self.model.objects.all()
+        qs = self.fields['pk'].queryset
+        for i in qs:
+            print(f"pk: {i.pk}")
 
 
 class GroupBulkEditForm(BootstrapMixin, forms.Form):
diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py
index fef10cfe2..c237ab0d8 100644
--- a/netbox/users/forms/model_forms.py
+++ b/netbox/users/forms/model_forms.py
@@ -171,7 +171,6 @@ class UserForm(BootstrapMixin, forms.ModelForm):
         ('User', ('username', 'password', 'confirm_password', 'first_name', 'last_name', 'email', )),
         ('Groups', ('groups', )),
         ('Status', ('is_active', 'is_staff', 'is_superuser', )),
-        ('Important Dates', ('last_login', 'date_joined', )),
         ('Permissions', ('object_permissions', )),
     )
 
@@ -179,7 +178,7 @@ class UserForm(BootstrapMixin, forms.ModelForm):
         model = NetBoxUser
         fields = [
             'username', 'first_name', 'last_name', 'email', 'groups', 'object_permissions',
-            'is_active', 'is_staff', 'is_superuser', 'last_login', 'date_joined',
+            'is_active', 'is_staff', 'is_superuser',
         ]
 
     def __init__(self, *args, **kwargs):
@@ -197,9 +196,6 @@ class UserForm(BootstrapMixin, forms.ModelForm):
             )
 
             del self.fields['confirm_password']
-        else:
-            del self.fields['date_joined']
-            del self.fields['last_login']
 
     # def is_valid(self):
     #     ret = super().is_valid()
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 329fe3355..72989e369 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -348,6 +348,15 @@ class NetBoxUserListView(generic.ObjectListView):
     filterset_form = forms.UserFilterForm
     table = tables.UserTable
 
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
+
+    def get(self, request, *args, **kwargs):
+        return super().get(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        return super().post(request, *args, **kwargs)
+
 
 @register_model_view(NetBoxUser)
 class NetBoxUserView(generic.ObjectView):
@@ -372,12 +381,6 @@ class NetBoxUserEditView(generic.ObjectEditView):
     queryset = NetBoxUser.objects.all()
     form = forms.UserForm
 
-    def get(self, request, *args, **kwargs):
-        return super().get(request, *args, **kwargs)
-
-    def post(self, request, *args, **kwargs):
-        return super().post(request, *args, **kwargs)
-
 
 @register_model_view(NetBoxUser, 'delete')
 class NetBoxUserDeleteView(generic.ObjectDeleteView):
@@ -401,6 +404,18 @@ class NetBoxUserBulkEditView(generic.BulkEditView):
     table = tables.UserTable
     form = forms.UserBulkEditForm
 
+    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 NetBoxUserBulkDeleteView(generic.BulkDeleteView):
     queryset = NetBoxUser.objects.all()