external-repos/ivatar
1
0
Fork 0
mirror of https://git.linux-kernel.at/oliver/ivatar.git synced 2025-11-17 21:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into 'master'

Browse Source 
Include fix for #89

See merge request oliver/ivatar!215
This commit is contained in:
Oliver Falk
2022-11-17 11:39:12 +00:00
parent a76d5b9225 93e8b3f07f
commit f359532c30
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ivatar/ivataraccount/views.py
View File

@@ -1080,10 +1080,9 @@ class PasswordResetView(PasswordResetViewOriginal):
user = None user = None
# Try to find the user via the normal user class # Try to find the user via the normal user class
try: # TODO: How to handle the case that multiple user accounts
user = User.objects.get(email=request.POST["email"]) # could have the same password set?
except ObjectDoesNotExist: user = User.objects.filter(email=request.POST["email"]).first()
pass
# If we didn't find the user in the previous step, # If we didn't find the user in the previous step,
# try the ConfirmedEmail class instead. # try the ConfirmedEmail class instead.

2
requirements.txt
View File

@@ -12,6 +12,7 @@ django-user-accounts
email-validator email-validator
fabric fabric
flake8-respect-noqa flake8-respect-noqa
git+https://github.com/daboth/pagan.git
git+https://github.com/ercpe/pydenticon5.git git+https://github.com/ercpe/pydenticon5.git
git+https://github.com/flavono123/identicon.git git+https://github.com/flavono123/identicon.git
git+https://github.com/ofalk/django-openid-auth git+https://github.com/ofalk/django-openid-auth
@@ -19,7 +20,6 @@ git+https://github.com/ofalk/monsterid.git
git+https://github.com/ofalk/Robohash.git@devel git+https://github.com/ofalk/Robohash.git@devel
mysqlclient mysqlclient
notsetuptools notsetuptools
pagan
Pillow Pillow
pip pip
psycopg2-binary psycopg2-binary