X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=51cfb495692fb9b6c6b71671eed1a0c10fe00206;hb=4b1c5e1eae849ea6d35d0431421b79c16a70cadc;hp=84719024b46dfc642580a4719461936253370aa4;hpb=d97a17fc5f4d7f1f7e70220171352224f64b2cf6;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index 8471902..51cfb49 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -1,47 +1,79 @@
+from django.contrib.auth.decorators import login_required
 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, HttpResponseForbidden
+from django.views.generic.list_detail import object_detail, object_list
 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')
+        fields = ('character', 'contact', 'summary', 'description')
 
 class CharacterForm(ContextModelForm):
     class Meta:
         model = Character
         fields = ('name')
 
-def add(request, character_id):
-    message = None
-
+@login_required
+def add(request, character_id=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
-
-    if f:
-        # Only allow characters of the current user
-        f.fields['character']._set_queryset(request.user.character_set.all())
+        influence = f.save(commit=False)
+	if (influence.character.player == request.user):
+		influence.save()
+		return HttpResponseRedirect(reverse('influences_influence_detail', args=[influence.id]))
+	else:
+		# TODO: Make this a bit more pretty. Perhaps throw an exception here and add some middleware to catch it?
+		return HttpResponseForbidden("Forbidden -- Trying to submit influence for somebody else's character")
+     
+    # Only allow characters of the current user
+    f.fields['character']._set_queryset(chars)
 
-    return render_to_response('influences/add.html', {'message' : message, 'form' : f})
+    return render_to_response('influences/add.html', {'form' : f}, RequestContext(request))
 
+@login_required
 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}, RequestContext(request))
+
+@login_required
+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))
+
+@login_required
+def character_list(*args, **kwargs):
+    return object_list(*args, **kwargs)
+
+@login_required
+def character_detail(*args, **kwargs):
+    return object_detail(*args, **kwargs)
 
-    return render_to_response('influences/add_character.html', {'message' : message, 'form' : f})
+@login_required
+def influence_detail(*args, **kwargs):
+    return object_detail(*args, **kwargs)