Skip to content

Commit

Permalink
Starting to support event-watchers
Browse files Browse the repository at this point in the history
  • Loading branch information
skyl committed Aug 14, 2009
1 parent c8bd0ed commit e708a52
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
22 changes: 22 additions & 0 deletions models.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes import generic


class EventGroup(models.Model):
event = models.OneToOneField('events.Event')
watchers = models.ManyToManyField('auth.User', blank=True, null=True)

def save(self, force_insert=False, force_update=False):
self.event.owner

class UsersPool(models.Model):
user = models.OneToOneField('events.Event')
events = models.ManyToManyField('events.Event', blank=True, null=True,
related_name="pool_events")

class FutureEventsManager(models.Manager):
''' Return all of the events, next one first
'''
Expand Down Expand Up @@ -33,6 +46,9 @@ class Event(models.Model):

owner = models.ForeignKey('auth.User')

watchers = models.ManyToManyField('auth.User',
related_name="watched_events")

content_type = models.ForeignKey(ContentType)
object_id = models.PositiveIntegerField()
content_object = generic.GenericForeignKey()
Expand All @@ -41,6 +57,10 @@ class Event(models.Model):
futures = FutureEventsManager()
pasts = PastEventsManager()

def watchers(self):
e = EventGroup.objects.get(event=self)
return e.watchers

def is_future(self):
return self.start >= datetime.datetime.now()

Expand All @@ -65,3 +85,5 @@ class Meta:
ordering=( 'start', )
unique_together = (('start', 'slug'),)



6 changes: 5 additions & 1 deletion templates/events/event_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@

</div>
<div style="float:left;">
<div id="calendar">
<div id="calendar" style="margin:1em;"></div>
</div>

<div id="directions" style="margin:1em;">
Where is this?
</div>

<div style="clear:both;"></div>


Expand Down

0 comments on commit e708a52

Please sign in to comment.