mirror of https://gitlab.crans.org/bde/nk20
A user is active iff the email and the account are validated
This commit is contained in:
parent
2c3127c746
commit
6498a20b87
|
@ -139,6 +139,7 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
|
|||
| Q(name__regex=pattern)
|
||||
| Q(normalized_name__regex=Alias.normalize(pattern)))) \
|
||||
.filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view"))\
|
||||
.filter(note__noteuser__user__profile__registration_valid=True)\
|
||||
.distinct("username")[:20]
|
||||
for note in note_qs:
|
||||
note.type = "Adhérent"
|
||||
|
|
|
@ -86,7 +86,7 @@ class UserValidateView(TemplateView):
|
|||
|
||||
if user is not None and email_validation_token.check_token(user, token):
|
||||
self.validlink = True
|
||||
user.is_active = True
|
||||
user.is_active = user.profile.registration_valid
|
||||
user.profile.email_confirmed = True
|
||||
user.save()
|
||||
user.profile.save()
|
||||
|
@ -242,7 +242,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView,
|
|||
return self.form_invalid(form)
|
||||
|
||||
ret = super().form_valid(form)
|
||||
user.is_active = True
|
||||
user.is_active = user.profile.email_confirmed
|
||||
user.profile.registration_valid = True
|
||||
user.profile.soge = soge
|
||||
user.save()
|
||||
|
|
Loading…
Reference in New Issue