Remove custom password reinit form
This commit is contained in:
parent
97b5469ac7
commit
0ff7a1ea3b
|
@ -79,11 +79,6 @@ class UserChangeForm(forms.ModelForm):
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
|
||||||
class ResetPasswordForm(forms.Form):
|
|
||||||
pseudo = forms.CharField(label=u'Pseudo', max_length=255)
|
|
||||||
email = forms.EmailField(max_length=255)
|
|
||||||
|
|
||||||
|
|
||||||
class BaseInfoForm(ModelForm):
|
class BaseInfoForm(ModelForm):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super(BaseInfoForm, self).__init__(*args, **kwargs)
|
super(BaseInfoForm, self).__init__(*args, **kwargs)
|
||||||
|
|
|
@ -32,7 +32,6 @@ urlpatterns = [
|
||||||
url(r'^add_right/(?P<userid>[0-9]+)$', views.add_right, name='add-right'),
|
url(r'^add_right/(?P<userid>[0-9]+)$', views.add_right, name='add-right'),
|
||||||
url(r'^del_right/$', views.del_right, name='del-right'),
|
url(r'^del_right/$', views.del_right, name='del-right'),
|
||||||
url(r'^process/(?P<token>[a-z0-9]{32})/$', views.process, name='process'),
|
url(r'^process/(?P<token>[a-z0-9]{32})/$', views.process, name='process'),
|
||||||
url(r'^reset_password/$', views.reset_password, name='reset-password'),
|
|
||||||
url(r'^history/(?P<object>user)/(?P<id>[0-9]+)$', views.history, name='history'),
|
url(r'^history/(?P<object>user)/(?P<id>[0-9]+)$', views.history, name='history'),
|
||||||
url(r'^history/(?P<object>listright)/(?P<id>[0-9]+)$', views.history, name='history'),
|
url(r'^history/(?P<object>listright)/(?P<id>[0-9]+)$', views.history, name='history'),
|
||||||
url(r'^$', views.index, name='index'),
|
url(r'^$', views.index, name='index'),
|
||||||
|
|
|
@ -22,7 +22,7 @@ from media.models import Emprunt
|
||||||
from users.decorators import user_is_in_campus
|
from users.decorators import user_is_in_campus
|
||||||
from users.forms import DelListRightForm, NewListRightForm, ListRightForm, RightForm, DelRightForm
|
from users.forms import DelListRightForm, NewListRightForm, ListRightForm, RightForm, DelRightForm
|
||||||
from users.forms import InfoForm, BaseInfoForm, StateForm, ClefForm, AdhesionForm
|
from users.forms import InfoForm, BaseInfoForm, StateForm, ClefForm, AdhesionForm
|
||||||
from users.forms import PassForm, ResetPasswordForm
|
from users.forms import PassForm
|
||||||
from users.models import User, Request, ListRight, Right, Clef, Adhesion
|
from users.models import User, Request, ListRight, Right, Clef, Adhesion
|
||||||
|
|
||||||
|
|
||||||
|
@ -513,32 +513,12 @@ def adherer(request, userid):
|
||||||
return redirect("/users/profil/" + userid)
|
return redirect("/users/profil/" + userid)
|
||||||
|
|
||||||
|
|
||||||
def reset_password(request):
|
|
||||||
userform = ResetPasswordForm(request.POST or None)
|
|
||||||
if userform.is_valid():
|
|
||||||
try:
|
|
||||||
user = User.objects.get(pseudo=userform.cleaned_data['pseudo'], email=userform.cleaned_data['email'])
|
|
||||||
except User.DoesNotExist:
|
|
||||||
messages.error(request, "Cet utilisateur n'existe pas")
|
|
||||||
return form({'userform': userform}, 'users/user.html', request)
|
|
||||||
req = Request()
|
|
||||||
req.type = Request.PASSWD
|
|
||||||
req.user = user
|
|
||||||
req.save()
|
|
||||||
reset_passwd_mail(req, request)
|
|
||||||
messages.success(request, "Un mail pour l'initialisation du mot de passe a été envoyé")
|
|
||||||
redirect("/")
|
|
||||||
return form({'userform': userform}, 'users/user.html', request)
|
|
||||||
|
|
||||||
|
|
||||||
def process(request, token):
|
def process(request, token):
|
||||||
valid_reqs = Request.objects.filter(expires_at__gt=timezone.now())
|
valid_reqs = Request.objects.filter(expires_at__gt=timezone.now())
|
||||||
req = get_object_or_404(valid_reqs, token=token)
|
req = get_object_or_404(valid_reqs, token=token)
|
||||||
|
|
||||||
if req.type == Request.PASSWD:
|
if req.type == Request.PASSWD:
|
||||||
return process_passwd(request, req)
|
return process_passwd(request, req)
|
||||||
elif req.type == Request.EMAIL:
|
|
||||||
return process_email(request, req=req)
|
|
||||||
else:
|
else:
|
||||||
messages.error(request, "Entrée incorrecte, contactez un admin")
|
messages.error(request, "Entrée incorrecte, contactez un admin")
|
||||||
redirect("/")
|
redirect("/")
|
||||||
|
|
Loading…
Reference in New Issue