phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

agenda address is string now

Browse Source
This commit is contained in:
Kuroshini 2020-01-30 19:43:30 +03:00
parent ced3abe3cf
commit 3b8a28d599
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/news/models.py
View File

@ -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"}')

6
apps/news/serializers.py
View File

@ -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()