From d7ec28b804e0fb239d881aa5faf37ca1ee67f522 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 14 Aug 2018 12:48:13 -0500
Subject: [PATCH] posts/show: fix 'Hide from queue' option in sidebar.

Fix 'Hide from queue' option appearing on deleted posts, but not on
pending or flagged posts.
---
 .../src/javascripts/post_moderation.js        | 29 -------------------
 .../posts/partials/show/_options.html.erb     |  3 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 app/javascript/src/javascripts/post_moderation.js

diff --git a/app/javascript/src/javascripts/post_moderation.js b/app/javascript/src/javascripts/post_moderation.js
deleted file mode 100644
index aa4782179..000000000
--- a/app/javascript/src/javascripts/post_moderation.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Utility from './utility'
-
-let PostModeration = {};
-
-PostModeration.initialize_all = function() {
-  if ($("#c-posts").length && $("#a-show").length) {
-    this.hide_or_show_approve_and_disapprove_links();
-    this.hide_or_show_delete_and_undelete_links();
-  }
-}
-
-PostModeration.hide_or_show_approve_and_disapprove_links = function() {
-  if (Utility.meta("post-is-approvable") !== "true") {
-    $("#approve").hide();
-    $("#disapprove").hide();
-  }
-}
-
-PostModeration.hide_or_show_delete_and_undelete_links = function() {
-  if (Utility.meta("post-is-deleted") === "true") {
-    $("#delete").hide();
-  } else {
-    $("#undelete").hide();
-  }
-}
-
-$(document).ready(function() {
-  PostModeration.initialize_all();
-});
diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index d2230acc5..70696f05f 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -39,9 +39,8 @@
           <li><%= link_to "Delete", confirm_delete_moderator_post_post_path(:post_id => post.id) %></li>
         <% end %>
 
-        <% if post.is_flagged? || post.is_pending? %>
+        <% if post.is_approvable? && !post.is_deleted? %>
           <li><%= link_to "Approve", moderator_post_approval_path(:post_id => post.id), :remote => true, :method => :post, :id => "approve", :"data-shortcut" => "shift+o", :"data-confirm" => "Are you sure you want to approve this post?" %></li>
-        <% else %>
           <li><%= link_to "Hide from queue", moderator_post_disapproval_path(post_disapproval: { post_id: post.id, reason: "disinterest" }), remote: true, method: :post, id: "disapprove" %></li>
         <% end %>