Merge branch 'master' into 'Qwann/Serializers'
# Conflicts: # event/models.py
This commit is contained in:
commit
26d7ad474f
1 changed files with 13 additions and 7 deletions
|
@ -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')
|
Loading…
Reference in a new issue