From 033ed6ce9290d432a1bd2adc3c2e6ccd599689a1 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 2 Dec 2012 15:05:03 -0500 Subject: [PATCH] flagging done except returning abuse flaggers --- lms/lib/comment_client/thread.py | 11 +++++++---- lms/static/coffee/src/discussion/content.coffee | 2 +- lms/static/coffee/src/discussion/utils.coffee | 2 +- .../views/discussion_thread_show_view.coffee | 13 ++++++------- lms/templates/discussion/_underscore_templates.html | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lms/lib/comment_client/thread.py b/lms/lib/comment_client/thread.py index 637196ebab..1bb70d6b9f 100644 --- a/lms/lib/comment_client/thread.py +++ b/lms/lib/comment_client/thread.py @@ -15,7 +15,7 @@ class Thread(models.Model): updatable_fields = [ 'title', 'body', 'anonymous', 'anonymous_to_peers', 'course_id', - 'closed', 'tags', 'user_id', 'commentable_id', + 'closed', 'tags', 'user_id', 'commentable_id' ] initializable_fields = updatable_fields @@ -80,21 +80,24 @@ class Thread(models.Model): 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} + params = {'user_id': user.id} request = perform_request('put', url, params) voteable.update_attributes(request) def unFlagAbuse(self, user, voteable, value): if voteable.type == 'thread': - url = _url_for_flag_abuse_thread(voteable.id) + url = _url_for_unflag_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} + params = {'user_id': user.id} 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) +def _url_for_unflag_abuse_thread(thread_id): + return "{prefix}/threads/{thread_id}/abuse_unflags".format(prefix=settings.PREFIX, thread_id=thread_id) + diff --git a/lms/static/coffee/src/discussion/content.coffee b/lms/static/coffee/src/discussion/content.coffee index ac6fbe38b2..de8351f64b 100644 --- a/lms/static/coffee/src/discussion/content.coffee +++ b/lms/static/coffee/src/discussion/content.coffee @@ -121,7 +121,7 @@ if Backbone? @trigger "change", @ unflagAbuse: -> - @get("abuse_flaggers").push window.user.get('id') + @get("abuse_flaggers").pop window.user.get('id') @trigger "change", @ display_body: -> diff --git a/lms/static/coffee/src/discussion/utils.coffee b/lms/static/coffee/src/discussion/utils.coffee index 6a05d92f60..4a4d9be648 100644 --- a/lms/static/coffee/src/discussion/utils.coffee +++ b/lms/static/coffee/src/discussion/utils.coffee @@ -49,7 +49,7 @@ class @DiscussionUtil create_comment : "/courses/#{$$course_id}/discussion/threads/#{param}/reply" delete_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/delete" flagAbuse_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/flagAbuse" - unflagAbuse_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/unFlagAbuse" + unFlagAbuse_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/unFlagAbuse" upvote_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/upvote" downvote_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/downvote" undo_vote_for_thread : "/courses/#{$$course_id}/discussion/threads/#{param}/unvote" diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee index 21282fbd2e..51f1d13f81 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee @@ -45,11 +45,11 @@ if Backbone? renderFlagged: => if window.user.id in @model.get("abuse_flaggers") - @$("[thread-flag]").addClass("flagged") - @$("[thread-flag]").removeClass("notflagged") + @$("[data-role=thread-flag]").addClass("flagged") + @$("[data-role=thread-flag]").removeClass("notflagged") else - @$("[thread-flag]").removeClass("flagged") - @$("[thread-flag]").addClass("notflagged") + @$("[data-role=thread-flag]").removeClass("flagged") + @$("[data-role=thread-flag]").addClass("notflagged") updateModelDetails: => @renderVoted() @@ -70,10 +70,11 @@ if Backbone? toggleFlagAbuse: (event) -> event.preventDefault() - if window.user in @model.get("abuse_flaggers") + if window.user.id in @model.get("abuse_flaggers") @unFlagAbuse() else @flagAbuse() + @renderFlagged() toggleFollowing: (event) -> @@ -102,7 +103,6 @@ if Backbone? @model.set(response, {silent: true}) flagAbuse: -> - alert('flag abuse') url = @model.urlFor("flagAbuse") DiscussionUtil.safeAjax $elem: @$(".discussion-flag-abuse") @@ -124,7 +124,6 @@ if Backbone? @model.set(response, {silent: true}) unFlagAbuse: -> - alert('unflag abuse') url = @model.urlFor("unFlagAbuse") DiscussionUtil.safeAjax $elem: @$(".discussion-flag-abuse") diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index d4a6e6db06..ebddfdde33 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -44,7 +44,7 @@
${'<%- body %>'}
- + Report Misuse ${'<% if (obj.courseware_url) { %>'}