* Make Influence.character no longer optional.

[matthijs/projects/xerxes.git] / influences / views.py

diff --git a/influences/views.py b/influences/views.py
index b13c83e6c3a9a5d1a99613c17196bf52303dc65a..3b26dac9d3f2b0b9d8959141adc3129d07223fef 100644 (file)
--- a/influences/views.py
+++ b/influences/views.py
@@ -1,6 +1,7 @@
 from django.shortcuts import render_to_response
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext as _
+from django.contrib.auth.models import User
 from ee.influences.models import Character
 from ee.influences.models import Influence
 from ee.tools.forms import ContextModelForm
@@ -32,7 +33,7 @@ def add(request, character_id):
         # Only allow characters of the current user
         f.fields['character']._set_queryset(request.user.character_set.all())
 
-    return render_to_response('influences/character_addinfluence.html', {'message' : message, 'form' : f})
+    return render_to_response('influences/add.html', {'message' : message, 'form' : f})
 
 def addCharacter(request):
     message = None
@@ -45,3 +46,8 @@ def addCharacter(request):
         f = None
 
     return render_to_response('influences/add_character.html', {'message' : message, 'form' : f})
+
+def index(request):
+    characters = request.user.character_set.all()
+    influences = Influence.objects.filter(character__in=characters)
+    return render_to_response('influences/index.html', {'characters' : characters, 'influences' : influences})