From: Harris Lapiroff Date: Tue, 5 Apr 2011 16:53:27 +0000 (-0400) Subject: Modified the get_start and get_end methods to return datetimes if times are specified. X-Git-Tag: philo-0.9~15^2~3^2^2 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/e34370024b84235952bddecb46029bcfd656bdc2?ds=sidebyside Modified the get_start and get_end methods to return datetimes if times are specified. --- diff --git a/contrib/julian/models.py b/contrib/julian/models.py index 333bcb3..c1682cc 100644 --- a/contrib/julian/models.py +++ b/contrib/julian/models.py @@ -65,10 +65,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