* Make Influence.character no longer optional.

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

diff --git a/influences/views.py b/influences/views.py
index 50ce60001996f26b82db32c2f8372aab70db8f5a..3b26dac9d3f2b0b9d8959141adc3129d07223fef 100644 (file)
--- a/influences/views.py
+++ b/influences/views.py
@@ -1,14 +1,15 @@
 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
 
 class InfluenceForm(ContextModelForm):
-       class Meta:
-               model = Influence
-               fields = ('character', 'contact', 'description')
+    class Meta:
+        model = Influence
+        fields = ('character', 'contact', 'description')
 
 class CharacterForm(ContextModelForm):
     class Meta:
@@ -16,22 +17,23 @@ class CharacterForm(ContextModelForm):
         fields = ('name')
 
 def add(request, character_id):
-       message = None
-
-       if (request.method == "POST"):
-               f = InfluenceForm(request.POST)
-               if (f.is_valid()):
-                       f.save()
-                       message = _("Influence added.")
-                       f = None
-       else:
-               f = InfluenceForm()
-       
-       if f:
-               # 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})
+    message = None
+
+    initial = {}
+    if (character_id):
+        initial['character'] = character_id
+
+    f = InfluenceForm(request=request, initial=initial)
+    if (f.is_valid()):
+        f.save()
+        message = _("Influence added.")
+        f = None
+
+    if f:
+        # Only allow characters of the current user
+        f.fields['character']._set_queryset(request.user.character_set.all())
+
+    return render_to_response('influences/add.html', {'message' : message, 'form' : f})
 
 def addCharacter(request):
     message = None
@@ -44,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})