Merge remote-tracking branch 'origin/main'

AuthApp/forms.py

@@ -30,21 +30,25 @@ 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()
+        i = 0
+        names = list(cleaned_data.keys())
+        while i < len(names):
+        # for name, val in cleaned_data.items():
+            if not cleaned_data[names[i]]:
+                self.add_error(names[i], _('Обязательное поле'))
+            i += 1
+
+        if cleaned_data and 'confirm_password' in cleaned_data and 'password' in cleaned_data:
+            if cleaned_data['confirm_password'] != cleaned_data['password']:
+                self.add_error("password", _('Пароль и подтверждение пароля не совпадают'))
+                self.add_error("confirm_password", _('Пароль и подтверждение пароля не совпадают'))
+
+        if cleaned_data and 'email' in cleaned_data:
+            users = User.objects.filter(email=cleaned_data['email'])
+            if users:
+                self.add_error('email', _("Пользователь с указанным email уже существует"))
+
 
 
 

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'])