X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=cf6429f0755dfa98ca21e73225089cc54fce8d88;hb=8d30a85b070625d27447328177e84ac900d3ff2e;hp=1025efa2e8ea6a5cbb5dff4d12bf610c00a94a1f;hpb=ceafe55f5acae09c6f51b72881a3d564bfe730fa;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/views.py b/influences/views.py index 1025efa..cf6429f 100644 --- a/influences/views.py +++ b/influences/views.py @@ -14,27 +14,40 @@ from threadedcomments.views import free_comment, _preview from xerxes.influences.models import Character from xerxes.influences.models import Influence from forms import get_influence_comment_form, InfluenceForm, CharacterForm +from xerxes.tools.misc import make_choices, filter_choices @login_required def add_influence(request, character_id=None): initial = {} # Get the current user's characters - chars = request.user.character_set.all() + my_chars = request.user.character_set.all().filter(type__in=[Character.PLAYER, Character.NPC]) + # Get all chars + all_chars = Character.objects.all().filter(type__in=[Character.PLAYER, Character.NPC]) # If a character_id was specified in the url, or there is only one # character, preselect it. if (character_id): - initial['character'] = character_id - elif (chars.count() == 1): - initial['character'] = chars[0].id - + initial['initiator'] = character_id + elif (my_chars.count() == 1): + initial['initiator'] = my_chars[0].id f = InfluenceForm(request=request, initial=initial) # Only allow characters of the current user. Putting this here also # ensures that a form will not validate when any other choice was # selected (perhaps through URL crafting). - f.fields['character']._set_queryset(chars) + f.fields['initiator']._set_queryset(my_chars) + + # List the contacts of each of the current users characters, as well + # as all other (non-contact) characters as choices for the + # other_characters field. + char_choices = [ + ("Contacts of %s" % c, make_choices(c.contacts.all())) + for c in my_chars + if c.contacts.all() + ] + char_choices.append(('All player characters', make_choices(all_chars))) + f.fields['other_characters'].choices = char_choices if (f.is_valid()): # The form was submitted, let's save it. @@ -47,6 +60,10 @@ def add_influence(request, character_id=None): @login_required def add_character(request): f = CharacterForm(request=request) + f.fields['type'].choices = filter_choices( + f.fields['type'].choices, + [Character.PLAYER, Character.NPC] + ) if (f.is_valid()): character = f.save(commit=False) character.player = request.user @@ -59,7 +76,7 @@ def add_character(request): def index(request): # Only show this player's characters and influences characters = request.user.character_set.all() - influences = Influence.objects.filter(character__player=request.user) + influences = Influence.objects.filter(initiator__player=request.user) return render_to_response('influences/index.html', {'characters' : characters, 'influences' : influences}, RequestContext(request)) # @@ -79,21 +96,19 @@ def character_list(request): def character_detail(request, object_id): o = Character.objects.get(pk=object_id) # Don't show other player's characters - if (o.player != request.user): + if (not request.user.is_staff and o.player != request.user): return HttpResponseForbidden("Forbidden -- Trying to view somebody else's character") return render_to_response('influences/character_detail.html', {'object' : o}, RequestContext(request)) @login_required def influence_list(request): - # Only show this player's influences - os = Influence.objects.filter(character__player=request.user) - return render_to_response('influences/influence_list.html', {'object_list' : os}, RequestContext(request)) + # Only show the influences related to this player's characters + characters = request.user.character_set.all() + return render_to_response('influences/influence_list.html', {'characters' : characters}, RequestContext(request)) def influence_comment_preview(request, context_processors, extra_context, **kwargs): # Use a custom template kwargs['template'] = 'influences/influence_comment_preview.html' - # The base template to extend - extra_context['base'] = "influences/influence_detail.html" # The object to be show in the influence detail extra_context['object'] = get_object_or_404(Influence, pk=kwargs['object_id']) return _preview(request, context_processors, extra_context, **kwargs) @@ -103,8 +118,8 @@ def influence_detail(request, object_id): o = Influence.objects.get(pk=object_id) # Don't show other player's influences - if (o.character.player != request.user): - return HttpResponseForbidden("Forbidden -- Trying to view influences of somebody else's character") + if (not request.user.is_staff and not request.user in o.related_players): + return HttpResponseForbidden("Forbidden -- Trying to view influences you are not involved in.") # Show all comments to staff, but only public comments to other # users @@ -118,13 +133,13 @@ def influence_detail(request, object_id): return render_to_response('influences/influence_detail.html', context, RequestContext(request)) @login_required -def influence_comment(request, object_id, edit_id=None): +def influence_comment(request, object_id, parent_id=None): kwargs = {} # Add the content_type, since we don't put in in the url explicitly kwargs['content_type'] = ContentType.objects.get_for_model(Influence).id # Find the comment to which we're replying, so we can get the right form for it. - if edit_id: - reply_to = get_object_or_404(ThreadedComment, id=edit_id) + if parent_id: + reply_to = get_object_or_404(ThreadedComment, id=parent_id) else: reply_to = None @@ -138,6 +153,6 @@ def influence_comment(request, object_id, edit_id=None): kwargs['preview'] = influence_comment_preview if parent_id: kwargs['prefix'] = "reply-to-%s" % (parent_id) - return free_comment(request, object_id=object_id, edit_id=edit_id, **kwargs) + return free_comment(request, object_id=object_id, parent_id=parent_id, **kwargs) # vim: set sts=4 sw=4 expandtab: