X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=b202c075efab02375cbe8a735a15cc14607b111d;hb=d55284fdb62ff1b4d8dec653bf13cf44b4b01022;hp=a8b9a7df631612d5491498d616c5344b48f1cdb7;hpb=10c0b5f57ee0c82993c04714c93ccf556ea9079d;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index a8b9a7d..b202c07 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -10,7 +10,7 @@ from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponseForbidden
 from django.views.generic.list_detail import object_detail, object_list
 from threadedcomments.models import ThreadedComment
-from threadedcomments.views import free_comment
+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
@@ -24,9 +24,9 @@ def add_influence(request, character_id=None):
     # If a character_id was specified in the url, or there is only one
     # character, preselect it.
     if (character_id):
-        initial['character'] = character_id
+        initial['initiator'] = character_id
     elif (chars.count() == 1):
-        initial['character'] = chars[0].id
+        initial['initiator'] = chars[0].id
 
 
     f = InfluenceForm(request=request, initial=initial)
@@ -34,7 +34,7 @@ def add_influence(request, character_id=None):
     # 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(chars)
 
     if (f.is_valid()):
         # The form was submitted, let's save it.
@@ -59,7 +59,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,22 +79,29 @@ 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)
+    os = Influence.objects.filter(initiator__player=request.user)
     return render_to_response('influences/influence_list.html', {'object_list' : os}, RequestContext(request))
 
+def influence_comment_preview(request, context_processors, extra_context, **kwargs):
+    # Use a custom template
+    kwargs['template'] = 'influences/influence_comment_preview.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)
+
 @login_required
 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):
+    if (not request.user.is_staff and o.initiator.player != request.user):
         return HttpResponseForbidden("Forbidden -- Trying to view influences of somebody else's character")
 
     # Show all comments to staff, but only public comments to other
@@ -109,13 +116,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
 
@@ -126,8 +133,9 @@ def influence_comment(request, object_id, edit_id=None):
     # that hardcodes the form_class.
     kwargs['model'] = ThreadedComment
     # Set a custom preview view
+    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: