From 3b8a28d599c1c21f7f01eeeaac89d86385f723ae Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 30 Jan 2020 19:43:30 +0300 Subject: [PATCH] agenda address is string now --- apps/news/models.py | 4 +--- apps/news/serializers.py | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/news/models.py b/apps/news/models.py index 963d8228..8788a358 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -30,9 +30,7 @@ class Agenda(ProjectBaseMixin, TranslatedFieldsMixin): verbose_name=_('Start datetime')) end_datetime = models.DateTimeField(default=timezone.now, editable=True, verbose_name=_('End datetime')) - address = models.ForeignKey('location.Address', blank=True, null=True, - default=None, verbose_name=_('address'), - on_delete=models.SET_NULL) + address = models.TextField(verbose_name=_('event address'), default=None, blank=True) event_name = TJSONField(blank=True, null=True, default=None, verbose_name=_('event name'), help_text='{"en-GB":"some text"}') diff --git a/apps/news/serializers.py b/apps/news/serializers.py index 7ff7d285..2116b1c0 100644 --- a/apps/news/serializers.py +++ b/apps/news/serializers.py @@ -22,9 +22,6 @@ from utils.serializers import ( class AgendaSerializer(ProjectModelSerializer): start_datetime = serializers.DateTimeField() end_datetime = serializers.DateTimeField() - address = AddressBaseSerializer(read_only=True) - address_id = serializers.PrimaryKeyRelatedField(write_only=True, queryset=location_models.Address.objects.all(), - source='address') event_name_translated = TranslatedField() content_translated = TranslatedField() @@ -39,7 +36,6 @@ class AgendaSerializer(ProjectModelSerializer): 'address', 'content_translated', 'event_name_translated', - 'address_id', ) @@ -287,7 +283,6 @@ class NewsBackOfficeBaseSerializer(NewsBaseSerializer): agenda = None if agenda_data is not None: - agenda_data['address_id'] = agenda_data.pop('address').pk agenda_serializer = AgendaSerializer(data=agenda_data) agenda_serializer.is_valid(raise_exception=True) agenda = agenda_serializer.save() @@ -314,7 +309,6 @@ class NewsBackOfficeBaseSerializer(NewsBaseSerializer): agenda = instance.agenda if agenda is None and agenda_data is not None: - agenda_data['address_id'] = agenda_data.pop('address').pk agenda_serializer = AgendaSerializer(data=agenda_data) agenda_serializer.is_valid(raise_exception=True) agenda_serializer.save()