Skip to content
Snippets Groups Projects
Verified Commit 53173268 authored by Ernesto Rico Schmidt's avatar Ernesto Rico Schmidt
Browse files

fix: get the timeslot_pk from the request path if timeslot_id is missing

parent aa7e7f41
No related branches found
No related tags found
No related merge requests found
...@@ -787,7 +787,12 @@ class NoteSerializer(serializers.ModelSerializer): ...@@ -787,7 +787,12 @@ class NoteSerializer(serializers.ModelSerializer):
contributors = validated_data.pop("contributors", []) contributors = validated_data.pop("contributors", [])
# required # required
validated_data["timeslot"] = validated_data.pop("timeslot_id") if "timeslot_id" in validated_data:
validated_data["timeslot"] = validated_data.pop("timeslot_id")
else:
# TODO: Once we remove nested routes, this hack should be removed
timeslot_pk = TimeSlot.objects.get(pk=self.context["request"].path.split("/")[-3])
validated_data["timeslot"] = validated_data.pop("timeslot_id", timeslot_pk)
# optional # optional
validated_data["image"] = validated_data.pop("image_id", None) validated_data["image"] = validated_data.pop("image_id", None)
...@@ -826,10 +831,10 @@ class NoteSerializer(serializers.ModelSerializer): ...@@ -826,10 +831,10 @@ class NoteSerializer(serializers.ModelSerializer):
instance.cba_id = validated_data.get("cba_id", instance.cba_id) instance.cba_id = validated_data.get("cba_id", instance.cba_id)
instance.content = validated_data.get("content", instance.content) instance.content = validated_data.get("content", instance.content)
instance.image = validated_data.get("image", instance.image_id) instance.image = validated_data.get("image_id", instance.image)
instance.slug = validated_data.get("slug", instance.slug) instance.slug = validated_data.get("slug", instance.slug)
instance.summary = validated_data.get("summary", instance.summary) instance.summary = validated_data.get("summary", instance.summary)
instance.timeslot = validated_data.get("timeslot", instance.timeslot_id) instance.timeslot = validated_data.get("timeslot_id", instance.timeslot)
instance.title = validated_data.get("title", instance.title) instance.title = validated_data.get("title", instance.title)
instance.contributors.set(validated_data.get("contributors", instance.contributors)) instance.contributors.set(validated_data.get("contributors", instance.contributors))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment