X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=41a1ecbe08cbd3db595a3e9b69344a47f80136ab;hb=9a6de634c384f0cd553b8e8404d5c1b192d59821;hp=1c7edb44753aa0dec03275fc869373a3883930c5;hpb=c5cbeefd03ddece1d37e966ad0b6f56ece29113f;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index 1c7edb4..41a1ecb 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -1,29 +1,58 @@
 from django.shortcuts import render_to_response
 from django.shortcuts import get_object_or_404
-from django import newforms as forms
 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(forms.ModelForm):
-	class Meta:
-		model = Influence
-		fields = ('character', 'contact', 'description')
+class InfluenceForm(ContextModelForm):
+    class Meta:
+        model = Influence
+        fields = ('character', 'contact', 'description')
+
+class CharacterForm(ContextModelForm):
+    class Meta:
+        model = Character
+        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 = {}
+    # Get the current user's characters
+    chars = request.user.character_set.all()
+
+    if (character_id):
+        initial['character'] = character_id
+    elif (chars.count() == 1):
+        initial['character'] = chars[0].id
+
+    f = InfluenceForm(request=request, initial=initial)
+    if (f.is_valid()):
+        f.save()
+        message = _("Influence added.")
+        f = None
+     
+    # Only allow characters of the current user
+    if f:
+        f.fields['character']._set_queryset(chars)
+
+    return render_to_response('influences/add.html', {'message' : message, 'form' : f})
+
+def addCharacter(request):
+    message = None
+    f = CharacterForm(request=request)
+    if (f.is_valid()):
+        c = f.save(commit=False)
+        c.player = request.user
+        c.save()
+        message = _("Character added.")
+        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})