Ticket #1659: userflags.2.diff

userflags.py

@@ -1 +1 @@
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.http import Http404
-from django.models.comments import comments, moderatordeletions, userflags
+from django.contrib.comments.models import Comment, ModeratorDeletion, UserFlag
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect
 from django.conf import settings
@@ -16 +16 @@
             the flagged `comments.comments` object
     """
     try:
-        comment = comments.get_object(pk=comment_id, site__id__exact=settings.SITE_ID)
-    except comments.CommentDoesNotExist:
+        comment = Comment.objects.get(pk=comment_id, site__id__exact=settings.SITE_ID)
+    except Comment.DoesNotExist:
         raise Http404
     if request.POST:
-        userflags.flag(comment, request.user)
+        UserFlag.flag(comment, request.user)
         return HttpResponseRedirect('%sdone/' % request.path)
-    return render_to_response('comments/flag_verify', {'comment': comment}, context_instance=RequestContext(request))
+    return render_to_response('comments/flag_verify.html', {'comment': comment}, context_instance=RequestContext(request))
 flag = login_required(flag)
 
 def flag_done(request, comment_id):
     try:
-        comment = comments.get_object(pk=comment_id, site__id__exact=settings.SITE_ID)
-    except comments.CommentDoesNotExist:
+        comment = Comment.objects.get(pk=comment_id, site__id__exact=settings.SITE_ID)
+    except Comment.DoesNotExist:
         raise Http404
-    return render_to_response('comments/flag_done', {'comment': comment}, context_instance=RequestContext(request))
+    return render_to_response('comments/flag_done.html', {'comment': comment}, context_instance=RequestContext(request))
 
 def delete(request, comment_id):
     """
@@ -42 +42 @@
             the flagged `comments.comments` object
     """
     try:
-        comment = comments.get_object(pk=comment_id, site__id__exact=settings.SITE_ID)
-    except comments.CommentDoesNotExist:
+        comment = Comment.objects.get(pk=comment_id, site__id__exact=settings.SITE_ID)
+    except Comment.DoesNotExist:
         raise Http404
-    if not comments.user_is_moderator(request.user):
+    if not Comment.objects.user_is_moderator(request.user):
         raise Http404
     if request.POST:
         # If the comment has already been removed, silently fail.
         if not comment.is_removed:
             comment.is_removed = True
             comment.save()
-            m = moderatordeletions.ModeratorDeletion(None, request.user.id, comment.id, None)
+            m = ModeratorDeletion(user=request.user, comment=comment)
             m.save()
         return HttpResponseRedirect('%sdone/' % request.path)
-    return render_to_response('comments/delete_verify', {'comment': comment}, context_instance=RequestContext(request))
+    return render_to_response('comments/delete_verify.html', {'comment': comment}, context_instance=RequestContext(request))
 delete = login_required(delete)
 
 def delete_done(request, comment_id):
     try:
-        comment = comments.get_object(pk=comment_id, site__id__exact=settings.SITE_ID)
-    except comments.CommentDoesNotExist:
+        comment = Comment.objects.get(pk=comment_id, site__id__exact=settings.SITE_ID)
+    except Comment.DoesNotExist:
         raise Http404
     return render_to_response('comments/delete_done', {'comment': comment}, context_instance=RequestContext(request))