Revert "Chaned the relationship name between Event and User."

This reverts commit ee5cb45.
agiliq · Sep 9, 2014 · 59cba10 · 59cba10
1 parent ee5cb45
commit 59cba10
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 33 deletions.
diff --git a/tavern/forms.py b/tavern/forms.py
@@ -20,7 +20,7 @@ class CreateEventForm(forms.ModelForm):
 
     class Meta:
         model = Event
-        exclude = ['creator', 'slug', 'show', 'attendees']
+        exclude = ['creator', 'slug', 'show', 'attending_events']
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop('current_user', None)
@@ -44,7 +44,7 @@ class UpdateEventForm(forms.ModelForm):
 
     class Meta:
         model = Event
-        exclude = ['creator', 'slug', 'show', 'group', 'attendees']
+        exclude = ['creator', 'slug', 'show', 'group', 'attending_events']
 
     def __init__(self, *args, **kwargs):
         super(UpdateEventForm, self).__init__(*args, **kwargs)

diff --git a/tavern/models.py b/tavern/models.py
@@ -86,7 +86,7 @@ class Event(models.Model):
     ends_at = models.DateTimeField(null=True, blank=True)
     location = models.TextField(null=True, blank=True)
 
-    attendees = models.ManyToManyField(User, through="Attendee",
+    attending_events = models.ManyToManyField(User, through="Attendee",
                                               related_name="events_attending")
     slug = models.SlugField(max_length=250)
 

diff --git a/tavern/templatetags/__init__.py b/tavern/templatetags/__init__.py
diff --git a/tavern/templatetags/tavern_tags.py b/tavern/templatetags/tavern_tags.py