git.ithinksw.org
/
philo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
96926ac
)
Moved the EventQuerySet to its own class instead of nesting it in the Event model.
author
Harris Lapiroff
<hlapirof@oberlin.edu>
Mon, 28 Mar 2011 20:19:34 +0000
(16:19 -0400)
committer
Harris Lapiroff
<hlapirof@oberlin.edu>
Mon, 28 Mar 2011 20:19:34 +0000
(16:19 -0400)
contrib/julian/models.py
patch
|
blob
|
history
diff --git
a/contrib/julian/models.py
b/contrib/julian/models.py
index
44b51f6
..
333bcb3
100644
(file)
--- a/
contrib/julian/models.py
+++ b/
contrib/julian/models.py
@@
-76,7
+76,17
@@
class TimedModel(models.Model):
class EventManager(models.Manager):
def get_query_set(self):
class EventManager(models.Manager):
def get_query_set(self):
- return self.model.QuerySet(self.model)
+ return EventQuerySet(self.model)
+
+class EventQuerySet(QuerySet):
+ def upcoming(self):
+ return self.filter(start_date__gte=datetime.date.today())
+ def current(self):
+ return self.filter(start_date__lte=datetime.date.today(), end_date__gte=datetime.date.today())
+ def single_day(self):
+ return self.filter(start_date__exact=models.F('end_date'))
+ def multiday(self):
+ return self.exclude(start_date__exact=models.F('end_date'))
class Event(Entity, TimedModel):
name = models.CharField(max_length=255)
class Event(Entity, TimedModel):
name = models.CharField(max_length=255)
@@
-101,20
+111,6
@@
class Event(Entity, TimedModel):
objects = EventManager()
objects = EventManager()
- class QuerySet(QuerySet):
-
- def upcoming(self):
- return self.filter(start_date__gte=datetime.date.today())
-
- def current(self):
- return self.filter(start_date__lte=datetime.date.today(), end_date__gte=datetime.date.today())
-
- def single_day(self):
- return self.filter(start_date__exact=models.F('end_date'))
-
- def multiday(self):
- return self.exclude(start_date__exact=models.F('end_date'))
-
def __unicode__(self):
return self.name
def __unicode__(self):
return self.name