Skip to content

Commit

Permalink
Correction des validateurs pour les membres (#3809)
Browse files Browse the repository at this point in the history
* Hotfix : correction des validateurs des formulaires

* Utilitaire utf8mb4 pour la validation

* Verification pour l'utf8mb4

* Correction des TU

* Corrections des validateurs

* Ajout d'un TU pour les formulaires et l'utf8mb4
  • Loading branch information
gustavi authored and vhf committed Sep 8, 2016
1 parent ac59cdd commit e11096a
Show file tree
Hide file tree
Showing 7 changed files with 306 additions and 283 deletions.
17 changes: 9 additions & 8 deletions zds/member/api/serializers.py
Expand Up @@ -5,7 +5,7 @@

from zds.member.commons import ProfileCreate
from zds.member.models import Profile
from zds.member.validators import ProfileUsernameValidator, ProfileEmailValidator
from zds.member.validators import validate_not_empty, validate_zds_username, validate_zds_email


class UserListSerializer(serializers.ModelSerializer):
Expand Down Expand Up @@ -42,15 +42,14 @@ class Meta:
fields = ('id', 'username', 'html_url', 'is_active', 'date_joined', 'avatar_url', 'permissions')


class ProfileCreateSerializer(serializers.ModelSerializer, ProfileCreate, ProfileUsernameValidator,
ProfileEmailValidator):
class ProfileCreateSerializer(serializers.ModelSerializer, ProfileCreate):
"""
Serializers of a user object to create one.
"""

id = serializers.ReadOnlyField(source='user.id')
username = serializers.CharField(source='user.username')
email = serializers.EmailField(source='user.email')
username = serializers.CharField(source='user.username', validators=[validate_not_empty, validate_zds_username])
email = serializers.EmailField(source='user.email', validators=[validate_not_empty, validate_zds_email])
password = serializers.CharField(source='user.password')
permissions = DRYPermissionsField(additional_actions=['ban'])

Expand Down Expand Up @@ -103,14 +102,16 @@ def __init__(self, *args, **kwargs):
self.fields.pop('email')


class ProfileValidatorSerializer(serializers.ModelSerializer, ProfileUsernameValidator, ProfileEmailValidator):
class ProfileValidatorSerializer(serializers.ModelSerializer):
"""
Serializers of a profile object used to update a member.
"""

id = serializers.ReadOnlyField(source='user.id')
username = serializers.CharField(source='user.username', required=False, allow_blank=True)
email = serializers.EmailField(source='user.email', required=False, allow_blank=True)
username = serializers.CharField(source='user.username', required=False, allow_blank=True,
validators=[validate_not_empty, validate_zds_username])
email = serializers.EmailField(source='user.email', required=False, allow_blank=True,
validators=[validate_not_empty, validate_zds_email])
is_active = serializers.BooleanField(source='user.is_active', required=False)
date_joined = serializers.DateTimeField(source='user.date_joined', required=False)
permissions = DRYPermissionsField(additional_actions=['ban'])
Expand Down

0 comments on commit e11096a

Please sign in to comment.