ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3578 from jsaalfeld/master

Browse Source 
Patch userdetails without redundant declaration of users details
This commit is contained in:
Emanuel Schütze 2018-04-04 12:15:34 +02:00 committed by GitHub
commit f3797601c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openslides/users/serializers.py
View File

@ -57,19 +57,23 @@ class UserFullSerializer(ModelSerializer):
def validate(self, data): def validate(self, data):
""" """
Checks that first_name or last_name is given. Generates the Checks if the given data is empty. Generates the
username if it is empty. username if it is empty.
""" """
if not (data.get('username') or data.get('first_name') or data.get('last_name')):
raise ValidationError({'detail': _('Username, given name and surname can not all be empty.')})
# Generate username. But only if it is not set and the serializer is not
# called in a PATCH context (partial_update).
try: try:
action = self.context['view'].action action = self.context['view'].action
except (KeyError, AttributeError): except (KeyError, AttributeError):
action = None action = None
# Check if we are in Patch context, if not, check if we have the mandatory fields
if action != 'partial_update':
if not (data.get('username') or data.get('first_name') or data.get('last_name')):
raise ValidationError({'detail': _('Username, given name and surname can not all be empty.')})
# Generate username. But only if it is not set and the serializer is not
# called in a PATCH context (partial_update).
if not data.get('username') and action != 'partial_update': if not data.get('username') and action != 'partial_update':
data['username'] = User.objects.generate_username( data['username'] = User.objects.generate_username(
data.get('first_name', ''), data.get('first_name', ''),