Merge pull request #3578 from jsaalfeld/master
Patch userdetails without redundant declaration of users details
This commit is contained in:
commit
f3797601c9
@ -57,18 +57,22 @@ class UserFullSerializer(ModelSerializer):
|
||||
|
||||
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.
|
||||
"""
|
||||
|
||||
try:
|
||||
action = self.context['view'].action
|
||||
except (KeyError, AttributeError):
|
||||
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).
|
||||
try:
|
||||
action = self.context['view'].action
|
||||
except (KeyError, AttributeError):
|
||||
action = None
|
||||
|
||||
if not data.get('username') and action != 'partial_update':
|
||||
data['username'] = User.objects.generate_username(
|
||||
|
Loading…
Reference in New Issue
Block a user