Merge branch 'master' into 'Qwann/Serializers'

# Conflicts:
#   event/models.py
This commit is contained in:
Erkan Narmanli 2017-08-13 18:27:40 +02:00
commit 26d7ad474f

View file

@ -30,12 +30,18 @@ class Event(SubscriptionMixin, models.Model):
editable=False, null=True,
)
created_at = models.DateTimeField(
_("date de création"),
_('date de création'),
auto_now_add=True,
)
description = models.TextField(_("description"))
beginning_date = models.DateTimeField(_("date de début"))
ending_date = models.DateTimeField(_("date de fin"))
description = models.TextField(_('description'))
beginning_date = models.DateTimeField(
_('date de début'),
help_text=_("date publique de l'évènement"),
)
ending_date = models.DateTimeField(
_('date de fin'),
help_text=_("date publique de l'évènement"),
)
class Meta:
verbose_name = _("évènement")