diff --git a/apps/authentication/api/connection_token.py b/apps/authentication/api/connection_token.py index 990e9d814..f85b1ee54 100644 --- a/apps/authentication/api/connection_token.py +++ b/apps/authentication/api/connection_token.py @@ -210,7 +210,7 @@ class ConnectionTokenMixin: class ConnectionTokenViewSet(ConnectionTokenMixin, RootOrgViewMixin, JMSModelViewSet): filterset_fields = ( - 'type', 'user_display', 'asset_display' + 'user_display', 'asset_display' ) search_fields = filterset_fields serializer_classes = { diff --git a/apps/authentication/migrations/0012_auto_20220816_1629.py b/apps/authentication/migrations/0012_auto_20220816_1629.py index 6e22b0e0f..23bcccb68 100644 --- a/apps/authentication/migrations/0012_auto_20220816_1629.py +++ b/apps/authentication/migrations/0012_auto_20220816_1629.py @@ -49,5 +49,9 @@ class Migration(migrations.Migration): migrations.RemoveField( model_name='connectiontoken', name='system_user', - ) + ), + migrations.RemoveField( + model_name='connectiontoken', + name='type', + ), ] diff --git a/apps/authentication/migrations/0013_remove_connectiontoken_type.py b/apps/authentication/migrations/0013_remove_connectiontoken_type.py deleted file mode 100644 index 52c6813dc..000000000 --- a/apps/authentication/migrations/0013_remove_connectiontoken_type.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.14 on 2022-10-26 08:07 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('authentication', '0012_auto_20220816_1629'), - ] - - operations = [ - migrations.RemoveField( - model_name='connectiontoken', - name='type', - ), - ] diff --git a/apps/authentication/serializers/connection_token.py b/apps/authentication/serializers/connection_token.py index 0905d5c60..58973ba70 100644 --- a/apps/authentication/serializers/connection_token.py +++ b/apps/authentication/serializers/connection_token.py @@ -23,7 +23,7 @@ class ConnectionTokenSerializer(OrgResourceModelSerializerMixin): class Meta: model = ConnectionToken - fields_mini = ['id', 'type'] + fields_mini = ['id'] fields_small = fields_mini + [ 'secret', 'date_expired', 'date_created', 'date_updated', 'created_by', 'updated_by', 'org_id', 'org_name',