git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'julian'
[philo.git]
/
contrib
/
julian
/
models.py
diff --git
a/contrib/julian/models.py
b/contrib/julian/models.py
index
5dea7a3
..
5c49c7e
100644
(file)
--- 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):
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):
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
class Meta:
abstract = True