Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

flagging working again

Browse Source
This commit is contained in:
Kevin Chugh
2013-04-05 16:39:22 -04:00
parent 0e8ef28347
commit de7c511328
8 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/static/coffee/src/discussion/views/discussion_content_view.coffee
View File

@@ -109,7 +109,7 @@ if Backbone?
toggleFlagAbuse: (event) ->
event.preventDefault()
if window.user.id in @model.get("abuse_flaggers")
if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isStaff(@model.get("user_id")) and @model.get("abuse_flaggers").length > 0)
@unFlagAbuse()
else
@flagAbuse()

2
common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
View File

@@ -46,7 +46,7 @@ if Backbone?
@$("[data-role=discussion-vote]").removeClass("is-cast")
renderFlagged: =>
if window.user.id in @model.get("abuse_flaggers") or @model.get("show_any_flag")
if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isStaff(@model.get("user_id")) 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")

2
common/static/coffee/src/discussion/views/response_comment_show_view.coffee
View File

@@ -45,7 +45,7 @@ if Backbone?
renderFlagged: =>
if window.user.id in @model.get("abuse_flaggers")
if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isStaff(@model.get("user_id")) and @model.get("abuse_flaggers").length > 0)
@$("[data-role=thread-flag]").addClass("flagged")
@$("[data-role=thread-flag]").removeClass("notflagged")
else

2
common/static/coffee/src/discussion/views/thread_response_show_view.coffee
View File

@@ -98,7 +98,7 @@ if Backbone?
renderFlagged: =>
if window.user.id in @model.get("abuse_flaggers")
if window.user.id in @model.get("abuse_flaggers") or or (DiscussionUtil.isStaff(@model.get("user_id")) 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")