Revert "fix merge conflict"

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.

common/static/coffee/src/discussion/content.coffee

@@ -88,32 +88,20 @@ if Backbone?
       pinned = @get("pinned")
       @set("pinned",pinned)
       @trigger "change", @
-    
-    flagAbuse: ->
-      temp_array = @get("abuse_flaggers")
-      temp_array.push(window.user.get('id'))
-      @set("abuse_flaggers",temp_array)
-      @trigger "change", @
 
-    unflagAbuse: ->
-      @get("abuse_flaggers").pop(window.user.get('id'))
-      @trigger "change", @
 
-    
   class @Thread extends @Content
     urlMappers:
-      'retrieve'    : -> DiscussionUtil.urlFor('retrieve_single_thread', @discussion.id, @id)
-      'reply'       : -> DiscussionUtil.urlFor('create_comment', @id)
-      'unvote'      : -> DiscussionUtil.urlFor("undo_vote_for_#{@get('type')}", @id)
-      'upvote'      : -> DiscussionUtil.urlFor("upvote_#{@get('type')}", @id)
-      'downvote'    : -> DiscussionUtil.urlFor("downvote_#{@get('type')}", @id)
-      'close'       : -> DiscussionUtil.urlFor('openclose_thread', @id)
-      'update'      : -> DiscussionUtil.urlFor('update_thread', @id)
-      'delete'      : -> DiscussionUtil.urlFor('delete_thread', @id)
-      'follow'      : -> DiscussionUtil.urlFor('follow_thread', @id)
-      'unfollow'    : -> DiscussionUtil.urlFor('unfollow_thread', @id)
-      'flagAbuse'   : -> DiscussionUtil.urlFor("flagAbuse_#{@get('type')}", @id)
-      'unFlagAbuse' : -> DiscussionUtil.urlFor("unFlagAbuse_#{@get('type')}", @id)
+      'retrieve' : -> DiscussionUtil.urlFor('retrieve_single_thread', @discussion.id, @id)
+      'reply'    : -> DiscussionUtil.urlFor('create_comment', @id)
+      'unvote'   : -> DiscussionUtil.urlFor("undo_vote_for_#{@get('type')}", @id)
+      'upvote'   : -> DiscussionUtil.urlFor("upvote_#{@get('type')}", @id)
+      'downvote' : -> DiscussionUtil.urlFor("downvote_#{@get('type')}", @id)
+      'close'    : -> DiscussionUtil.urlFor('openclose_thread', @id)
+      'update'   : -> DiscussionUtil.urlFor('update_thread', @id)
+      'delete'   : -> DiscussionUtil.urlFor('delete_thread', @id)
+      'follow'   : -> DiscussionUtil.urlFor('follow_thread', @id)
+      'unfollow' : -> DiscussionUtil.urlFor('unfollow_thread', @id)
       'pinThread'   : -> DiscussionUtil.urlFor("pin_thread", @id)
       'unPinThread' : -> DiscussionUtil.urlFor("un_pin_thread", @id)
 
@@ -169,8 +157,6 @@ if Backbone?
       'endorse': -> DiscussionUtil.urlFor('endorse_comment', @id)
       'update': -> DiscussionUtil.urlFor('update_comment', @id)
       'delete': -> DiscussionUtil.urlFor('delete_comment', @id)
-      'flagAbuse'   : -> DiscussionUtil.urlFor("flagAbuse_#{@get('type')}", @id)
-      'unFlagAbuse' : -> DiscussionUtil.urlFor("unFlagAbuse_#{@get('type')}", @id)
 
     getCommentsCount: ->
       count = 0

common/static/coffee/src/discussion/discussion.coffee

@@ -37,9 +37,6 @@ if Backbone?
           data['commentable_ids'] = options.commentable_ids
         when 'all'
           url = DiscussionUtil.urlFor 'threads'
-        when 'flagged'
-          data['flagged'] = true
-          url = DiscussionUtil.urlFor 'search'
         when 'followed'
           url = DiscussionUtil.urlFor 'followed_threads', options.user_id
       if options['group_id']

common/static/coffee/src/discussion/utils.coffee

@@ -18,12 +18,8 @@ class @DiscussionUtil
   @loadRoles: (roles)->
     @roleIds = roles
 
-  @loadFlagModerator: (what)->
-    @isFlagModerator = what
-
   @loadRolesFromContainer: ->
     @loadRoles($("#discussion-container").data("roles"))
-    @loadFlagModerator($("#discussion-container").data("flag-moderator"))
 
   @isStaff: (user_id) ->
     staff = _.union(@roleIds['Staff'], @roleIds['Moderator'], @roleIds['Administrator'])
@@ -52,10 +48,6 @@ class @DiscussionUtil
       update_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/update"
       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"
-      flagAbuse_comment       : "/courses/#{$$course_id}/discussion/comments/#{param}/flagAbuse"
-      unFlagAbuse_comment     : "/courses/#{$$course_id}/discussion/comments/#{param}/unFlagAbuse"
       upvote_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/upvote"
       downvote_thread         : "/courses/#{$$course_id}/discussion/threads/#{param}/downvote"
       pin_thread              : "/courses/#{$$course_id}/discussion/threads/#{param}/pin"   
@@ -80,7 +72,7 @@ class @DiscussionUtil
       permanent_link_thread   : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}"
       permanent_link_comment  : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}##{param2}"
       user_profile            : "/courses/#{$$course_id}/discussion/forum/users/#{param}"
-      followed_threads        : "/courses/#{$$course_id}/discussion/forum/users/#{param}/followed"
+      followed_threads       : "/courses/#{$$course_id}/discussion/forum/users/#{param}/followed"
       threads                 : "/courses/#{$$course_id}/discussion/forum"
     }[name]
 

common/static/coffee/src/discussion/views/discussion_content_view.coffee

@@ -1,11 +1,6 @@
 if Backbone?
   class @DiscussionContentView extends Backbone.View
 
-  
-    events:
-      "click .discussion-flag-abuse": "toggleFlagAbuse"
-  
-  
     attrRenderer:
       endorsed: (endorsed) ->
         if endorsed
@@ -99,48 +94,7 @@ if Backbone?
 
     setWmdContent: (cls_identifier, text) =>
       DiscussionUtil.setWmdContent @$el, $.proxy(@$, @), cls_identifier, text
-      
 
     initialize: ->
       @initLocal()
       @model.bind('change', @renderPartialAttrs, @)
-      
-     
-     
-    toggleFlagAbuse: (event) ->
-      event.preventDefault()
-      if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
-        @unFlagAbuse()
-      else
-        @flagAbuse()
-      
-    flagAbuse: ->
-      url = @model.urlFor("flagAbuse")
-      DiscussionUtil.safeAjax
-        $elem: @$(".discussion-flag-abuse")
-        url: url
-        type: "POST"
-        success: (response, textStatus) =>
-          if textStatus == 'success'
-            ###
-            note, we have to clone the array in order to trigger a change event
-            ###
-            temp_array = _.clone(@model.get('abuse_flaggers'));
-            temp_array.push(window.user.id)
-            @model.set('abuse_flaggers', temp_array)      
-       
-    unFlagAbuse: ->
-      url = @model.urlFor("unFlagAbuse")
-      DiscussionUtil.safeAjax
-        $elem: @$(".discussion-flag-abuse")
-        url: url
-        type: "POST"
-        success: (response, textStatus) =>
-          if textStatus == 'success'
-            temp_array = _.clone(@model.get('abuse_flaggers'));
-            temp_array.pop(window.user.id)
-            # if you're an admin, clear this
-            if DiscussionUtil.isFlagModerator
-                temp_array = []
-
-            @model.set('abuse_flaggers', temp_array)         

common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee

@@ -276,11 +276,6 @@ if Backbone?
           @$(".post-search-field").val("")
           @$('.cohort').show()                    
           @retrieveAllThreads()
-        else if discussionId == "#flagged"
-          @discussionIds = ""
-          @$(".post-search-field").val("")
-          @$('.cohort').hide() 
-          @retrieveFlaggedThreads() 
         else if discussionId == "#following"
           @retrieveFollowed(event)
           @$('.cohort').hide()
@@ -326,12 +321,6 @@ if Backbone?
       @collection.reset()
       @loadMorePages(event)
 
-    retrieveFlaggedThreads: (event)->
-      @collection.current_page = 0
-      @collection.reset()
-      @mode = 'flagged'
-      @loadMorePages(event)
-
     sortThreads: (event) ->
       @$(".sort-bar a").removeClass("active")
       $(event.target).addClass("active")

common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee

@@ -3,7 +3,6 @@ if Backbone?
 
     events:
       "click .discussion-vote": "toggleVote"
-      "click .discussion-flag-abuse": "toggleFlagAbuse"
       "click .admin-pin": "togglePin"
       "click .action-follow": "toggleFollowing"
       "click .action-edit": "edit"
@@ -26,7 +25,6 @@ if Backbone?
       @delegateEvents()
       @renderDogear()
       @renderVoted()
-      @renderFlagged()
       @renderPinned()
       @renderAttrs()
       @$("span.timeago").timeago()
@@ -44,16 +42,6 @@ if Backbone?
         @$("[data-role=discussion-vote]").addClass("is-cast")
       else
         @$("[data-role=discussion-vote]").removeClass("is-cast")
-        
-    renderFlagged: =>
-      if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
-        @$("[data-role=thread-flag]").addClass("flagged")  
-        @$("[data-role=thread-flag]").removeClass("notflagged")
-        @$(".discussion-flag-abuse .flag-label").html("Misuse Reported")
-      else
-        @$("[data-role=thread-flag]").removeClass("flagged")  
-        @$("[data-role=thread-flag]").addClass("notflagged")      
-        @$(".discussion-flag-abuse .flag-label").html("Report Misuse")
 
     renderPinned: =>
       if @model.get("pinned")
@@ -68,7 +56,6 @@ if Backbone?
 
     updateModelDetails: =>
       @renderVoted()
-      @renderFlagged()
       @renderPinned()
       @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"])
 
@@ -109,7 +96,6 @@ if Backbone?
           if textStatus == 'success'
             @model.set(response, {silent: true})
 
-
     unvote: ->
       window.user.unvote(@model)
       url = @model.urlFor("unvote")
@@ -121,7 +107,6 @@ if Backbone?
           if textStatus == 'success'
             @model.set(response, {silent: true})
 
-
     edit: (event) ->
       @trigger "thread:edit", event
 
@@ -197,4 +182,4 @@ if Backbone?
         params = $.extend(params, user:{username: @model.username, user_url: @model.user_url})
       Mustache.render(@template, params)
 
-     
+     

common/static/coffee/src/discussion/views/discussion_thread_view.coffee

@@ -91,7 +91,7 @@ if Backbone?
       body = @getWmdContent("reply-body")
       return if not body.trim().length
       @setWmdContent("reply-body", "")
-      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), votes: { up_count: 0 }, abuse_flaggers:[], endorsed: false, user_id: window.user.get("id"))
+      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), votes: { up_count: 0 }, endorsed: false, user_id: window.user.get("id"))
       comment.set('thread', @model.get('thread'))
       @renderResponse(comment)
       @model.addComment()

common/static/coffee/src/discussion/views/response_comment_show_view.coffee

@@ -1,14 +1,7 @@
 if Backbone?
   class @ResponseCommentShowView extends DiscussionContentView
-  
-    events:
-      "click .discussion-flag-abuse": "toggleFlagAbuse"  
 
     tagName: "li"
-    
-    initialize: ->
-        super()
-        @model.on "change", @updateModelDetails
 
     render: ->
       @template = _.template($("#response-comment-show-template").html())
@@ -18,7 +11,6 @@ if Backbone?
       @initLocal()
       @delegateEvents()
       @renderAttrs()
-      @renderFlagged()
       @markAsStaff()
       @$el.find(".timeago").timeago()
       @convertMath()
@@ -42,17 +34,3 @@ if Backbone?
         @$el.find("a.profile-link").after('<span class="staff-label">staff</span>')
       else if DiscussionUtil.isTA(@model.get("user_id"))
         @$el.find("a.profile-link").after('<span class="community-ta-label">Community&nbsp;&nbsp;TA</span>')
-        
-        
-    renderFlagged: =>
-      if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
-        @$("[data-role=thread-flag]").addClass("flagged")  
-        @$("[data-role=thread-flag]").removeClass("notflagged")
-      else
-        @$("[data-role=thread-flag]").removeClass("flagged")  
-        @$("[data-role=thread-flag]").addClass("notflagged")  
-      
-    updateModelDetails: =>
-      @renderFlagged()
-        
-        

common/static/coffee/src/discussion/views/thread_response_show_view.coffee

@@ -5,7 +5,6 @@ if Backbone?
         "click .action-endorse": "toggleEndorse"
         "click .action-delete": "delete"
         "click .action-edit": "edit"
-        "click .discussion-flag-abuse": "toggleFlagAbuse"
 
     $: (selector) ->
         @$el.find(selector)
@@ -24,7 +23,6 @@ if Backbone?
       if window.user.voted(@model)
         @$(".vote-btn").addClass("is-cast")
       @renderAttrs()
-      @renderFlagged()
       @$el.find(".posted-details").timeago()
       @convertMath()
       @markAsStaff()
@@ -72,7 +70,6 @@ if Backbone?
         success: (response, textStatus) =>
           if textStatus == 'success'
             @model.set(response)
-            
 
     edit: (event) ->
         @trigger "response:edit", event
@@ -95,17 +92,3 @@ if Backbone?
         url: url
         data: data
         type: "POST"
-
-            
-    renderFlagged: =>
-      if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
-        @$("[data-role=thread-flag]").addClass("flagged")  
-        @$("[data-role=thread-flag]").removeClass("notflagged")
-        @$(".discussion-flag-abuse .flag-label").html("Misuse Reported")
-      else
-        @$("[data-role=thread-flag]").removeClass("flagged")  
-        @$("[data-role=thread-flag]").addClass("notflagged")      
-        @$(".discussion-flag-abuse .flag-label").html("Report Misuse")   
-        
-    updateModelDetails: =>
-      @renderFlagged()

common/static/coffee/src/discussion/views/thread_response_view.coffee

@@ -77,7 +77,7 @@ if Backbone?
       body = @getWmdContent("comment-body")
       return if not body.trim().length
       @setWmdContent("comment-body", "")
-      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), abuse_flaggers:[], user_id: window.user.get("id"), id:"unsaved")
+      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), user_id: window.user.get("id"), id:"unsaved")
       view = @renderComment(comment)
       @hideEditorChrome()
       @trigger "comment:add", comment