X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/cd3e03effc20790582d5ae6e8f2c1597c49ce31e..2b607d5a5e948a3399f110bd04583d2213db24ce:/contrib/julian/models.py diff --git a/contrib/julian/models.py b/contrib/julian/models.py index 5dea7a3..5c49c7e 100644 --- a/contrib/julian/models.py +++ b/contrib/julian/models.py @@ -79,10 +79,10 @@ class TimedModel(models.Model): raise ValidationError("A %s cannot end before it starts." % self.__class__.__name__) def get_start(self): - return self.start_date + return datetime.datetime.combine(self.start_date, self.start_time) if self.start_time else self.start_date def get_end(self): - return self.end_date + return datetime.datetime.combine(self.end_date, self.end_time) if self.end_time else self.end_date class Meta: abstract = True