diff --git a/r2/r2/public/static/js/reddit.js b/r2/r2/public/static/js/reddit.js index dc2f58fa2..59a43f439 100644 --- a/r2/r2/public/static/js/reddit.js +++ b/r2/r2/public/static/js/reddit.js @@ -1137,10 +1137,21 @@ function big_mod_action(elem, dir) { if (dir == -1) { $.request("remove", d, null, true); + elem.siblings(".spammed").show(); + elem.siblings(".removed").hide(); + elem.siblings(".approved").hide(); + } else if (dir == -2) { + d = { + id: thing_id, + spam: false + }; + $.request("remove", d, null, true); + elem.siblings(".spammed").hide(); elem.siblings(".removed").show(); elem.siblings(".approved").hide(); } else if (dir == 1) { $.request("approve", d, null, true); + elem.siblings(".spammed").hide(); elem.siblings(".removed").hide(); elem.siblings(".approved").show(); } diff --git a/r2/r2/templates/printablebuttons.html b/r2/r2/templates/printablebuttons.html index 064d02932..727e39e05 100644 --- a/r2/r2/templates/printablebuttons.html +++ b/r2/r2/templates/printablebuttons.html @@ -125,8 +125,10 @@ ${pretty_button(_("confirm %(obj)s removal") % dict(obj=kind), "big_mod_action", -1, "negative")} %else: - ${pretty_button(_("remove %(obj)s") % dict(obj=kind), + ${pretty_button(_("spam %(obj)s") % dict(obj=kind), "big_mod_action", -1, "negative")} + ${pretty_button(_("remove %(obj)s") % dict(obj=kind), + "big_mod_action", -2, "negative")} %endif %if getattr(thing, "approval_checkmark", None): @@ -138,6 +140,9 @@ %endif +