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

Merge branch 'feature/news_event_model_update' into 'develop'

Browse Source 
Feature/news event model update

See merge request gm/gm-backend!77
This commit is contained in:
d.kuzmenko 2019-12-23 13:45:47 +00:00
commit cb8f0fe2d9
3 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/news/migrations/0050_auto_20191223_1148.py Normal file
View File

@ -0,0 +1,34 @@
# Generated by Django 2.2.7 on 2019-12-23 11:48
from django.db import migrations, models
import django.utils.timezone
import utils.models
class Migration(migrations.Migration):
dependencies = [
('news', '0049_auto_20191223_0619'),
]
operations = [
migrations.RemoveField(
model_name='agenda',
name='event_datetime',
),
migrations.AddField(
model_name='agenda',
name='end_datetime',
field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='End datetime'),
),
migrations.AddField(
model_name='agenda',
name='event_name',
field=utils.models.TJSONField(blank=True, default=None, help_text='{"en-GB":"some text"}', null=True, verbose_name='event name'),
),
migrations.AddField(
model_name='agenda',
name='start_datetime',
field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Start datetime'),
),
]

10
apps/news/models.py
View File

@ -22,12 +22,16 @@ from datetime import datetime
class Agenda(ProjectBaseMixin, TranslatedFieldsMixin):
"""News agenda model"""
event_datetime = models.DateTimeField(default=timezone.now, editable=False,
verbose_name=_('Event datetime'))
start_datetime = models.DateTimeField(default=timezone.now, editable=True,
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)
event_name = TJSONField(blank=True, null=True, default=None,
verbose_name=_('event name'),
help_text='{"en-GB":"some text"}')
content = TJSONField(blank=True, null=True, default=None,
verbose_name=_('content'),
help_text='{"en-GB":"some text"}')

10
apps/news/serializers.py
View File

@ -20,8 +20,10 @@ from utils.serializers import (
class AgendaSerializer(ProjectModelSerializer):
event_datetime = serializers.DateTimeField()
start_datetime = serializers.DateTimeField()
end_datetime = serializers.DateTimeField()
address = AddressBaseSerializer()
event_name_translated = TranslatedField()
content_translated = TranslatedField()
class Meta:
@ -30,9 +32,11 @@ class AgendaSerializer(ProjectModelSerializer):
model = models.Agenda
fields = (
'id',
'event_datetime',
'start_datetime',
'end_datetime',
'address',
'content_translated'
'content_translated',
'event_name_translated'
)