13044 fix bulk import

netbox/users/forms/bulk_import.py

@@ -37,5 +37,5 @@ class UserImportForm(CSVModelForm):
 class UserTokenImportForm(CSVModelForm):
 
     class Meta:
-        model = Token
+        model = UserToken
-        fields = ('description', )
+        fields = ('key', 'user', 'expires', 'description',)

netbox/users/forms/filtersets.py

@@ -10,6 +10,7 @@ from netbox.forms import NetBoxModelFilterSetForm
 from users.models import NetBoxGroup, NetBoxUser, ObjectPermission
 from utilities.forms import BOOLEAN_WITH_BLANK_CHOICES
 from utilities.forms.fields import DynamicModelMultipleChoiceField
+from utilities.forms.widgets import DateTimePicker
 
 __all__ = (
     'GroupFilterForm',
@@ -117,3 +118,22 @@ class ObjectPermissionFilterForm(NetBoxModelFilterSetForm):
 
 class UserTokenFilterForm(SavedFiltersMixin, FilterForm):
     model = Token
+    fieldsets = (
+        (None, ('q', 'filter_id',)),
+        (_('Data'), ('user_id', 'expires', 'last_used')),
+    )
+    user_id = DynamicModelMultipleChoiceField(
+        queryset=get_user_model().objects.all(),
+        required=False,
+        label=_('User')
+    )
+    expires = forms.DateTimeField(
+        required=False,
+        label=_('Expires'),
+        widget=DateTimePicker()
+    )
+    last_used = forms.DateTimeField(
+        required=False,
+        label=_('Last Used'),
+        widget=DateTimePicker()
+    )

netbox/users/models.py

@@ -26,6 +26,7 @@ __all__ = (
     'ObjectPermission',
     'Token',
     'UserConfig',
+    'UserToken',
 )