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, editable=False, null=True,
) )
created_at = models.DateTimeField( created_at = models.DateTimeField(
_("date de création"), _('date de création'),
auto_now_add=True, auto_now_add=True,
) )
description = models.TextField(_("description")) description = models.TextField(_('description'))
beginning_date = models.DateTimeField(_("date de début")) beginning_date = models.DateTimeField(
ending_date = models.DateTimeField(_("date de fin")) _('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: class Meta:
verbose_name = _("évènement") verbose_name = _("évènement")
@ -213,4 +219,4 @@ class Activity(AbstractActivityTemplate):
verbose_name_plural = _("activités") verbose_name_plural = _("activités")
def __str__(self): def __str__(self):
return self.get_herited('title') return self.get_herited('title')