diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-08-03 17:49:19 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-08-03 17:49:19 (GMT) |
| commit | 31406aa5c3c53341cdadbc760b95d234ccdc20c6 (patch) | |
| tree | 1538fc4e320f7a31add2f259c0da5bb6837d07be /program/models.py | |
| parent | 8b02218b9c1f524d37e2a20a613a7301a7aa7689 (diff) | |
| parent | abadb84db12788af3ecf525d6c2fb9c72efc2595 (diff) | |
Merge branch 'master' into stable
Diffstat (limited to 'program/models.py')
| -rw-r--r-- | program/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/models.py b/program/models.py index 97324b1..eef8f93 100644 --- a/program/models.py +++ b/program/models.py @@ -465,10 +465,10 @@ class TimeSlot(models.Model): verbose_name_plural = _("Time slots") def __unicode__(self): - start = self.start.strftime('%d. %b %Y %H:%M') + start = self.start.strftime('%d.%m.%Y %H:%M') end = self.end.strftime('%H:%M') - return u'%s: %s - %s' % (self.show, start, end) + return u'%s - %s | %s' % (start, end, self.show.name) def save(self, *args, **kwargs): self.show = self.programslot.show |