X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=41a1ecbe08cbd3db595a3e9b69344a47f80136ab;hb=216e7e2abfa5096921c4022c65c89298d7b7a4f8;hp=84719024b46dfc642580a4719461936253370aa4;hpb=d97a17fc5f4d7f1f7e70220171352224f64b2cf6;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/views.py b/influences/views.py index 8471902..41a1ecb 100644 --- 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 @@ -19,18 +20,23 @@ def add(request, character_id): 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: - # Only allow characters of the current user - f.fields['character']._set_queryset(request.user.character_set.all()) + f.fields['character']._set_queryset(chars) return render_to_response('influences/add.html', {'message' : message, 'form' : f}) @@ -45,3 +51,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})