diff --git a/AuthApp/forms.py b/AuthApp/forms.py index 3bb6697..a324d3a 100644 --- a/AuthApp/forms.py +++ b/AuthApp/forms.py @@ -30,21 +30,15 @@ class RegistrationForm(forms.Form): agreement = forms.BooleanField(initial=False, required=True) def clean(self): - pass - # cleaned_data = super().clean() - # for item in self.changed_data: - # if item in self.data: - # - # - # cc_myself = cleaned_data.get("cc_myself") - # subject = cleaned_data.get("subject") - # - # if cc_myself and subject: - # # Only do something if both fields are valid so far. - # if "help" not in subject: - # raise ValidationError( - # "Did not send for 'help' in the subject despite " "CC'ing yourself." - # ) + cleaned_data = super().clean() + if cleaned_data['confirm_password'] != cleaned_data['password']: + self.add_error("password", _('Пароль и подтверждение пароля не совпадают')) + self.add_error("confirm_password", _('Пароль и подтверждение пароля не совпадают')) + + users = User.objects.filter(email=cleaned_data['email']) + if users: + self.add_error('email', _("Пользователь с указанным email уже существует")) + diff --git a/AuthApp/js_views.py b/AuthApp/js_views.py index 639cb37..d769b82 100644 --- a/AuthApp/js_views.py +++ b/AuthApp/js_views.py @@ -393,12 +393,12 @@ def registration_ajax(request): html = render_to_string('forms/f_registration.html', Dict, request=request) return JsonResponse({'html': html}, status=400) - users = User.objects.filter(email=form.data['email']) - if users: - form.errors['email'] = _("Пользователь с указанным email уже существует") - Dict = {'form': form} - html = render_to_string('forms/f_registration.html', Dict, request=request) - return JsonResponse({'html': html}, status=400) + # users = User.objects.filter(email=form.data['email']) + # if users: + # form.errors['email'] = _("Пользователь с указанным email уже существует") + # Dict = {'form': form} + # html = render_to_string('forms/f_registration.html', Dict, request=request) + # return JsonResponse({'html': html}, status=400) user = User.objects.create_user(username=form.data['email'], email=form.data['email'], password=form.data['password']) # user = auth.authenticate(username=new_user_Dict['name'], password=new_user_Dict['pass'])