thubrecht/poulpe
1
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'Qwann/Serializers'

Browse source 
# Conflicts:
#   event/models.py
This commit is contained in:
Erkan Narmanli 2017-08-13 18:27:40 +02:00
commit 26d7ad474f
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
event/models.py
View file

@ -30,12 +30,18 @@ class Event(SubscriptionMixin, models.Model):
editable=False, null=True,
)
created_at = models.DateTimeField(
_("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"))
_('date de création'),
auto_now_add=True,
)
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")
@ -213,4 +219,4 @@ class Activity(AbstractActivityTemplate):
verbose_name_plural = _("activités")
def __str__(self):
return self.get_herited('title')
return self.get_herited('title')