From: Harris Lapiroff <hlapirof@oberlin.edu>
Date: Tue, 5 Apr 2011 17:00:23 +0000 (-0400)
Subject: Merge branch 'julian'
X-Git-Tag: philo-0.9~15^2~3^2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/bf78e0c846297a4f732ffdfc181b3c89428fd2a4?hp=0e2ac53b71dfec624589fe858687f63089ae175f

Merge branch 'julian'
---

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