Filled with Data / Addressbook corrections

website/views.py

@@ -21,24 +21,25 @@ from django.contrib.auth.models import User
 def home_view(request):
     context = dict()
 
-
     # Event participation for slider text
-    context['hasParticipationSetForAllEvents'] = EventParticipation.hasUserSetParticipationForAllEvents( request.user)
-
+    if EventParticipation.isMember( request.user ):
+        context['hasParticipationSetForAllEvents'] = EventParticipation.hasUserSetParticipationForAllEvents( request.user)
 
     # Countdown
     countdown = dict()
     events = Event.objects.filter( date__gte = datetime.now() ).order_by('date')[:1]
     if ( len(events) > 0 ):
         nextEvent = events[0]
-        part = EventParticipation.objects.filter( user = request.user ).filter( event = nextEvent )
+        
+        if EventParticipation.isMember( request.user ):
+            part = EventParticipation.objects.filter( user = request.user ).filter( event = nextEvent )
+            countdown['participation'] = part[0].status
 
         eventTime = datetime( events[0].date.year, events[0].date.month, events[0].date.day, 
                               events[0].displaytime.hour, events[0].displaytime.minute )
 
         countdown['event'] = events[0]
         countdown['epoch'] = int(  (eventTime - datetime.now() ).total_seconds() * 1000 )
-        countdown['participation'] = part[0].status
         
         context['countdown'] = countdown
     
@@ -128,5 +129,5 @@ from django.core.urlresolvers import reverse
 
 def change_password( request ):
     template_name = "website/change_password.html"
-    return django.contrib.auth.views.password_change(request, template_name, post_change_redirect= reverse(home_view) )
+    return django.contrib.auth.views.password_change(request, template_name, post_change_redirect= "/" )