X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=4df518f6a2902143dd65ef22c30908555b9f90ba;hb=50d53a0b193e533b67672639c3baadf5bc77f863;hp=50ce60001996f26b82db32c2f8372aab70db8f5a;hpb=69974d5dca02a99311dd5d97ae9907c31f500892;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index 50ce600..4df518f 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -1,46 +1,57 @@
 from django.shortcuts import render_to_response
 from django.shortcuts import get_object_or_404
+from django.template import RequestContext
 from django.utils.translation import ugettext as _
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect
 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', 'summary', 'description')
 
 class CharacterForm(ContextModelForm):
     class Meta:
         model = Character
         fields = ('name')
 
-def add(request, character_id):
-	message = None
+def add(request, character_id=None):
+    initial = {}
+    # Get the current user's characters
+    chars = request.user.character_set.all()
 
-	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())
+    if (character_id):
+        initial['character'] = character_id
+    elif (chars.count() == 1):
+        initial['character'] = chars[0].id
 
-	return render_to_response('influences/character_addinfluence.html', {'message' : message, 'form' : f})
+    f = InfluenceForm(request=request, initial=initial)
+    if (f.is_valid()):
+        influence = f.save()
+        return HttpResponseRedirect(reverse('influences_influence_detail', args=[influence.id]))
+     
+    # Only allow characters of the current user
+    f.fields['character']._set_queryset(chars)
+
+    return render_to_response('influences/add.html', {'form' : f}, RequestContext(request))
 
 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
+        character = f.save(commit=False)
+        character.player = request.user
+        character.save()
+        return HttpResponseRedirect(reverse('influences_character_detail', args=[character.id]))
+
+    return render_to_response('influences/add_character.html', {'form' : f})
 
-    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}, RequestContext(request))