diff --git a/apps/accounts/admin.py b/apps/accounts/admin.py index 8b978de4e5..453b928e7d 100644 --- a/apps/accounts/admin.py +++ b/apps/accounts/admin.py @@ -30,12 +30,9 @@ class ProfileAdmin(ImportExportTimeStampedAdmin): "recieve_newsletter", ) search_fields = ( - "user__first_name", - "user__last_name", - "contact_number", - "github_url", - "google_scholar_url", - "linkedin_url", + "user__username", + "user__email", + "affiliation", ) @@ -44,9 +41,14 @@ class Meta: model = User fields = ( "id", - "date_joined", + "username", "email", "first_name", + "last_name", + "is_active", + "is_staff", + "is_superuser", + "date_joined", "last_login", "last_name", "staff_status", @@ -54,12 +56,12 @@ class Meta: ) -class UserAdmin(ExportMixin, UserAdmin): +class CustomUserAdmin(ExportMixin, UserAdmin): resource_class = UserResource admin.site.unregister(User) -admin.site.register(User, UserAdmin) +admin.site.register(User, CustomUserAdmin) class TokenResource(resources.ModelResource): @@ -67,14 +69,14 @@ class Meta: model = Token -class TokenAdmin(TokenAdmin): +class CustomTokenAdmin(TokenAdmin): resource_class = TokenResource list_filter = ("created",) search_fields = ("user__username",) admin.site.unregister(Token) -admin.site.register(Token, TokenAdmin) +admin.site.register(Token, CustomTokenAdmin) @admin.register(JwtToken) @@ -96,9 +98,9 @@ class Meta: model = EmailAddress -class EmailAddressAdmin(ExportMixin, EmailAddressAdmin): +class CustomEmailAddressAdmin(ExportMixin, EmailAddressAdmin): resource_class = EmailAddressResource admin.site.unregister(EmailAddress) -admin.site.register(EmailAddress, EmailAddressAdmin) +admin.site.register(EmailAddress, CustomEmailAddressAdmin) diff --git a/apps/accounts/models.py b/apps/accounts/models.py index b3866dd1b3..779bcc7e38 100644 --- a/apps/accounts/models.py +++ b/apps/accounts/models.py @@ -27,7 +27,7 @@ class UserStatus(TimeStampedModel): status = models.CharField(max_length=30, unique=True) def __str__(self): - return self.name + return str(self.name) class Meta: app_label = "accounts" diff --git a/apps/accounts/views.py b/apps/accounts/views.py index 9c89f3d83a..617a154aa6 100644 --- a/apps/accounts/views.py +++ b/apps/accounts/views.py @@ -68,7 +68,7 @@ def get_auth_token(request): "-created_at" )[0] response_data = { - "token": "{}".format(token.refresh_token), + "token": f"{token.refresh_token}", "expires_at": outstanding_token.expires_at, } return Response(response_data, status=status.HTTP_200_OK) @@ -124,7 +124,7 @@ def refresh_auth_token(request): if token_serializer.is_valid(): token_serializer.save() token = token_serializer.instance - response_data = {"token": "{}".format(token.refresh_token)} + response_data = {"token": f"{token.refresh_token}"} return Response(response_data, status=status.HTTP_200_OK) return Response(response_data, status=status.HTTP_400_BAD_REQUEST) diff --git a/apps/web/models.py b/apps/web/models.py index d0f3aca10b..d621e9a2a6 100644 --- a/apps/web/models.py +++ b/apps/web/models.py @@ -19,7 +19,7 @@ class Contact(TimeStampedModel): ) def __str__(self): - return "{0}: {1}: {2}".format(self.name, self.email, self.message) + return f"{self.name}: {self.email}: {self.message}" class Meta: app_label = "web" @@ -32,7 +32,7 @@ class Subscribers(TimeStampedModel): email = models.EmailField(max_length=70) def __str__(self): - return "{}".format(self.email) + return f"{self.email}" class Meta: app_label = "web" @@ -64,7 +64,7 @@ class Team(models.Model): position = models.PositiveIntegerField(default=0) def __str__(self): - return self.name + return str(self.name) class Meta: app_label = "web"