commit based off master

tavern/models.py

@@ -4,8 +4,8 @@
 from django.utils import timezone
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
-from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.db.models.signals import post_save
 
 from .slugify import unique_slugify
 
@@ -45,6 +45,10 @@ def get_absolute_url(self):
     def save(self, *args, **kwargs):
         self.slug = slugify(self.name)
         super(TavernGroup, self).save(*args, **kwargs)
+        Membership.objects.get_or_create(
+            user=self.creator,
+            tavern_group=self,
+            defaults={'join_date': timezone.now()})
 
     def __unicode__(self):
         return "%s" % self.name
@@ -132,7 +136,8 @@ class Attendee(models.Model):
                                    default="yes")
 
     def __unicode__(self):
-        return "%s - %s" % (self.user.first_name, self.event.name)
+        return "%s - %s - %s" % (self.user.first_name, self.event.name,
+                                 self.rsvp_status)
 
 
 def get_unjoined_groups(user):

tavern/tests.py

@@ -57,7 +57,7 @@ def test_tavern_attendees(self):
                                            rsvped_on=datetime.now(),
                                            rsvp_status="yes")
         self.assertEqual(Attendee.objects.count(), 2)
-        self.assertEqual(attendee.__unicode__(), u' - Tavern Event')
+        self.assertEqual(attendee.__unicode__(), u' - Tavern Event - yes')
 
     def test_event_permisssions(self):
         """Test that creator of an event have change and delete

tavern/views.py

@@ -164,7 +164,6 @@ def get_object(self, **kwargs):
             event = group.event_set.get(slug=event_name)
         except Event.DoesNotExist:
             raise Http404
-        return event
 
 
 class GroupCreate(LoginRequiredMixin, CreateView):