wayfinderak/geeksbot_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo modification to update due to it not working

Browse Source
This commit is contained in:
Dustin Pianalto 2019-12-14 03:18:20 -09:00
parent 7d3d7104d9
commit d4fab12829
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
geeksbot_web/users/serializers.py
View File

@ -1,6 +1,4 @@
from rest_framework import serializers from rest_framework import serializers
from rest_framework.serializers import raise_errors_on_nested_writes
from rest_framework.utils import model_meta
from users.models import User from users.models import User
from users.models import UserLog from users.models import UserLog
@ -47,37 +45,12 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
prev_discrims = set(instance.previous_discriminators or []) prev_discrims = set(instance.previous_discriminators or [])
prev_discrims.add(instance.discriminator) prev_discrims.add(instance.discriminator)
validated_data['previous_discriminators'] = list(prev_discrims) validated_data['previous_discriminators'] = list(prev_discrims)
if 'guild' in validated_data and 'guilds' not in validated_data: if 'guilds' in validated_data:
validated_data['guilds'] = [validated_data['guild']] guilds = set(instance.guilds or [])
for guild in validated_data['guilds']:
# Copied with slight changes from super.update() guilds.add(guild)
raise_errors_on_nested_writes('update', self, validated_data) validated_data['guilds'] = list(guilds)
info = model_meta.get_field_info(instance) return super(UserSerializer, self).update(instance, validated_data)
# Simply set each attribute on the instance, and then save it.
# Note that unlike `.create()` we don't need to treat many-to-many
# relationships as being a special case. During updates we already
# have an instance pk for the relationships to be associated with.
m2m_fields = []
for attr, value in validated_data.items():
if attr in info.relations and info.relations[attr].to_many:
m2m_fields.append((attr, value))
else:
setattr(instance, attr, value)
instance.save()
# Note that many-to-many fields are set after updating instance.
# Setting m2m fields triggers signals which could potentially change
# updated instance and we do not want it to collide with .update()
for attr, value in m2m_fields:
field = getattr(instance, attr)
if isinstance(value, (list, tuple, set)):
field.add(*value)
else:
field.add(value)
return instance
class UserLogSerializer(serializers.ModelSerializer): class UserLogSerializer(serializers.ModelSerializer):