Bugfix for Countdown

- error when for the next event no displaytime was available
- better display when no time or location for the next event is known
This commit is contained in:
Martin Bauer
2014-01-11 11:46:53 +01:00
parent c693b7b1e5
commit 4d4c83b0ae
3 changed files with 12 additions and 6 deletions

View File

@@ -61,8 +61,14 @@ class Event ( models.Model ):
else:
return self.meeting_time
@property
def displaydatetime(self):
if not self.displaytime == None:
return datetime.combine( self.date, self.displaytime() )
else:
return datetime.combine( self.date, datetime.min.time())
class EventParticipation( models.Model ):
OPTIONS = ( ('?' , _('?' )),