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

diff --git a/influences/views.py b/influences/views.py
index 1ab2d22..a8b9a7d 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -1,27 +1,19 @@
+from django import forms
 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.contrib.contenttypes.models import ContentType
 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', 'summary', 'description')
-
-class CharacterForm(ContextModelForm):
-    class Meta:
-        model = Character
-        fields = ('name')
+from threadedcomments.models import ThreadedComment
+from threadedcomments.views import free_comment
+from xerxes.influences.models import Character
+from xerxes.influences.models import Influence
+from forms import get_influence_comment_form, InfluenceForm, CharacterForm
 
 @login_required
 def add_influence(request, character_id=None):
@@ -50,7 +42,7 @@ def add_influence(request, character_id=None):
         # Redirect to the just saved influence
         return HttpResponseRedirect(reverse('influences_influence_detail', args=[influence.id]))
 
-    return render_to_response('influences/add.html', {'form' : f}, RequestContext(request))
+    return render_to_response('influences/add_influence.html', {'form' : f}, RequestContext(request))
 
 @login_required
 def add_character(request):
@@ -99,10 +91,43 @@ def influence_list(request):
 
 @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):
         return HttpResponseForbidden("Forbidden -- Trying to view influences of somebody else's character")
-    return render_to_response('influences/influence_detail.html', {'object' : o}, RequestContext(request))
+
+    # Show all comments to staff, but only public comments to other
+    # users
+    comments = o.get_comments(private=request.user.is_staff)
+    
+    context  = {
+        'object' : o,
+        'comments' : comments,
+        'comment_form' : get_influence_comment_form(request.user.is_staff, None)()
+    }
+    return render_to_response('influences/influence_detail.html', context, RequestContext(request))
+
+@login_required
+def influence_comment(request, object_id, edit_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)
+    else:
+        reply_to = None
+
+    # Find the right form class
+    kwargs['form_class']   = get_influence_comment_form(request.user.is_staff, reply_to)
+    # Override the model, so we don't get a free comment, but a normal
+    # one. We can't use threadedcomments' comment view for that, since
+    # that hardcodes the form_class.
+    kwargs['model'] = ThreadedComment
+    # Set a custom preview view
+    if parent_id:
+        kwargs['prefix'] = "reply-to-%s" % (parent_id)
+    return free_comment(request, object_id=object_id, edit_id=edit_id, **kwargs)
 
 # vim: set sts=4 sw=4 expandtab: