Fix admin panel avatars and avatar static removal at robot deletion

This commit is contained in:
rs 2022-02-15 13:03:46 +00:00
parent d77b8404c6
commit fb5ef28b5d
3 changed files with 4 additions and 4 deletions

View File

@ -227,7 +227,7 @@ class Profile(models.Model):
orders_disputes_started = models.CharField(max_length=999, null=True, default=None, validators=[validate_comma_separated_integer_list], blank=True) # Will only store ID of orders orders_disputes_started = models.CharField(max_length=999, null=True, default=None, validators=[validate_comma_separated_integer_list], blank=True) # Will only store ID of orders
# RoboHash # RoboHash
avatar = models.ImageField(default=(settings.STATIC_ROOT+"unknown_avatar.png"), verbose_name='Avatar', blank=True) avatar = models.ImageField(default=("static/assets/avatars/"+"unknown_avatar.png"), verbose_name='Avatar', blank=True)
# Penalty expiration (only used then taking/cancelling repeatedly orders in the book before comitting bond) # Penalty expiration (only used then taking/cancelling repeatedly orders in the book before comitting bond)
penalty_expiration = models.DateTimeField(null=True,default=None, blank=True) penalty_expiration = models.DateTimeField(null=True,default=None, blank=True)
@ -247,7 +247,7 @@ class Profile(models.Model):
@receiver(pre_delete, sender=User) @receiver(pre_delete, sender=User)
def del_avatar_from_disk(sender, instance, **kwargs): def del_avatar_from_disk(sender, instance, **kwargs):
try: try:
avatar_file=Path(settings.AVATAR_ROOT + instance.profile.avatar.url) avatar_file=Path(settings.AVATAR_ROOT + instance.profile.avatar.url.split('/')[-1])
avatar_file.unlink() avatar_file.unlink()
except: except:
pass pass

View File

@ -415,7 +415,7 @@ class UserView(APIView):
if len(User.objects.filter(username=nickname)) == 0: if len(User.objects.filter(username=nickname)) == 0:
User.objects.create_user(username=nickname, password=token, is_staff=False) User.objects.create_user(username=nickname, password=token, is_staff=False)
user = authenticate(request, username=nickname, password=token) user = authenticate(request, username=nickname, password=token)
user.profile.avatar = nickname + '.png' user.profile.avatar = "static/assets/avatars/" + nickname + '.png'
login(request, user) login(request, user)
return Response(context, status=status.HTTP_201_CREATED) return Response(context, status=status.HTTP_201_CREATED)

View File

@ -1,4 +1,4 @@
django==3.2.11 django==3.2.12
django-admin-relation-links==0.2.5 django-admin-relation-links==0.2.5
django-celery-beat==2.2.1 django-celery-beat==2.2.1
django-celery-results==2.2.0 django-celery-results==2.2.0