Stop acct creation from using usernames still in the retirement queue

This commit is contained in:
bmedx
2018-08-10 16:48:53 -04:00
parent c4ee7dacbc
commit 2d71697823
2 changed files with 30 additions and 7 deletions

View File

@@ -788,7 +788,7 @@ class AccountRetirementStatusView(ViewSet):
retirement = None
if len(retirements) < 1:
raise UserRetirementStatus.DoesNotExist()
elif len(retirements) > 1:
elif len(retirements) >= 1:
for r in retirements:
if r.original_username == username:
retirement = r
@@ -796,10 +796,6 @@ class AccountRetirementStatusView(ViewSet):
# UserRetirementStatus was found, but it was the wrong case.
if retirement is None:
raise UserRetirementStatus.DoesNotExist()
else:
if username != retirements[0].original_username:
raise UserRetirementStatus.DoesNotExist()
retirement = retirements[0]
retirement.update_state(request.data)
return Response(status=status.HTTP_204_NO_CONTENT)