Fixed some register bugs
This commit is contained in:
parent
25f79e9e21
commit
96233f5df3
@ -48,6 +48,7 @@ class RandomLevel(CSRFexemptTemplateView):
|
||||
bloonsa_util.tag_player(request=request)
|
||||
player: Player = request.user.player
|
||||
|
||||
# Make this filter only beaten_by
|
||||
level: Level = Level.objects.order_by("?").filter(~Q(played_by=player)).first()
|
||||
if not level:
|
||||
level: Level = Level.objects.order_by("?").first()
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
<div id="profile-box">
|
||||
<div id="avatar-box">
|
||||
<img id="avatar" src="{% static 'bloonsa_game/img/profilebox/user.png' %}">
|
||||
<img id="avatar" src="{{ user.player.avatar.url }}">
|
||||
</div>
|
||||
|
||||
<div id="profile-user">
|
||||
|
||||
@ -23,9 +23,8 @@ class BloonsaUtil:
|
||||
def init_player(self, request):
|
||||
if not request.user.is_authenticated:
|
||||
return
|
||||
player = request.user.player
|
||||
if player:
|
||||
return player
|
||||
if hasattr(request.user, "player"):
|
||||
return request.user.player
|
||||
ip = self.get_ip(request=request)
|
||||
player = Player(user=request.user,
|
||||
creation_ip=ip,
|
||||
@ -39,9 +38,7 @@ class BloonsaUtil:
|
||||
return
|
||||
if not request.user.is_authenticated:
|
||||
return
|
||||
player = request.user.player
|
||||
if not player:
|
||||
player = self.init_player(request=request)
|
||||
player = self.init_player(request=request)
|
||||
if player.banned:
|
||||
# TODO message popup?
|
||||
logout(request)
|
||||
|
||||
@ -38,8 +38,7 @@ class RegisterView(TemplateView):
|
||||
user = form.save()
|
||||
player = bloonsa_util.init_player(request=request)
|
||||
login(request=request, user=user)
|
||||
|
||||
bloonsa_util.log(player=user.player,
|
||||
bloonsa_util.log(player=player,
|
||||
action=actions.login)
|
||||
return redirect("bloonsa_game:game")
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user