Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions apps/accounts/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)


Expand All @@ -44,37 +41,42 @@ 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",
"username",
)


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):
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)
Expand All @@ -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)
2 changes: 1 addition & 1 deletion apps/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions apps/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
6 changes: 3 additions & 3 deletions apps/web/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down