Merge 4bbdc7f into 452f67e

agiliq · Oct 13, 2014 · b207867 · b207867
2 parents 452f67e + 4bbdc7f
commit b207867
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/tavern/templates/tavern/past_events.html b/tavern/templates/tavern/past_events.html
@@ -3,6 +3,8 @@ <h1> Recently completed Events</h1>
     <ul>
     {% for event in past_events %}
         <li><a href="{% url 'tavern_event_details' event.slug %}">{{ event.name }}</a></li>
+        {% empty %}
+        No Completed Events
     {% endfor %}
     </ul>
 </div>
diff --git a/tavern/views.py b/tavern/views.py
@@ -138,7 +138,7 @@ def get_context_data(self, **kwargs):
         group = TavernGroup.objects.get(slug=group_name)
         event = group.event_set.get(slug=event_name)
         try:
-            attendee = Attendee.objects.get(user=self.request.user,
+            attendee = Attendee.objects.get(user=self.request.user.id,
                                             event=event)
             if attendee.rsvp_status == 'yes':
                 message = "You are attending this event."