X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fviews.py;h=7f7b2621f918a588e03e7e356853b0d45514ffb7;hb=dec395df81b874a8b88e34935712f9265d412eef;hp=fe062d553edfd64f56ca59e8a71c2366fec60f7f;hpb=30a84ff9b7a3f25441e3ed36d53ddfcf100a19f0;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/views.py b/influences/views.py
index fe062d5..7f7b262 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -79,7 +79,7 @@ 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))
 
@@ -92,8 +92,6 @@ def influence_list(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,7 +101,7 @@ 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.character.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