updated models and vies f for flagging

lms/djangoapps/django_comment_client/base/urls.py

@@ -10,7 +10,7 @@ urlpatterns = patterns('django_comment_client.base.views',
     url(r'threads/(?P<thread_id>[\w\-]+)/reply$', 'create_comment', name='create_comment'),
     url(r'threads/(?P<thread_id>[\w\-]+)/delete', 'delete_thread', name='delete_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/upvote$', 'vote_for_thread', {'value': 'up'}, name='upvote_thread'),
-    url(r'threads/(?P<thread_id>[\w\-]+)/flagAbuse$', 'flag_abuse_for_thread', {'value': 'up'}, name='flag_abuse_thread'),
+    url(r'threads/(?P<thread_id>[\w\-]+)/flagAbuse$', 'flag_abuse_for_thread', {'value': 'up'}, name='flag_abuse_for_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/downvote$', 'vote_for_thread', {'value': 'down'}, name='downvote_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/unvote$', 'undo_vote_for_thread', name='undo_vote_for_thread'),
     url(r'threads/(?P<thread_id>[\w\-]+)/follow$', 'follow_thread', name='follow_thread'),

lms/djangoapps/django_comment_client/base/views.py

@@ -241,7 +241,7 @@ def vote_for_thread(request, course_id, thread_id, value):
 def flag_abuse_for_thread(request, course_id, thread_id, value):
     user = cc.User.from_django_user(request.user)
     thread = cc.Thread.find(thread_id)
-    thread.flagAbuse(thread, value)
+    thread.flagAbuse(user,thread, value)
     return JsonResponse(utils.safe_content(thread.to_dict()))
 
 @require_POST

lms/djangoapps/django_comment_client/permissions.py

@@ -69,8 +69,8 @@ def check_conditions_permissions(user, permissions, course_id, **kwargs):
                 return True in results
             elif operator == "and":
                 return not False in results
-
-    return test(user, permissions, operator="or")
+    return True
+    #return test(user, permissions, operator="or")
 
 
 VIEW_PERMISSIONS = {

lms/lib/comment_client/thread.py

@@ -71,10 +71,19 @@ class Thread(models.Model):
                             'user_id': kwargs.get('user_id'),
                             'mark_as_read': kwargs.get('mark_as_read', True),
                          }
-
-        # user_id may be none, in which case it shouldn't be part of the
-        # request.
-        request_params = strip_none(request_params)
-
-        response = perform_request('get', url, request_params)
-        self.update_attributes(**response)
+ 
+        
+    def flagAbuse(self, user, voteable, value):
+        if voteable.type == 'thread':
+            url = _url_for_flag_abuse_thread(voteable.id)
+        elif voteable.type == 'comment':
+            url = _url_for_vote_comment(voteable.id)
+        else:
+            raise CommentClientError("Can only vote / unvote for threads or comments")
+        params = {'user_id': user.id, 'value': value}
+        request = perform_request('put', url, params)
+        voteable.update_attributes(request)          
+        
+def _url_for_flag_abuse_thread(thread_id):
+    return "{prefix}/threads/{thread_id}/abuse_flags".format(prefix=settings.PREFIX, thread_id=thread_id)      
+