From 7028417bfbf7b641dc6c9c81c811842a4ad9efb4 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 13 Aug 2018 01:50:52 -0500
Subject: [PATCH] posts/show: fix 'Flag' option in sidebar.

* Don't show 'Flag' option on already flagged posts.
* Drop flag/appeal link show/hide Javascript (did nothing, links were already shown/hidden in html).
---
 app/javascript/src/javascripts/post_appeals.js  | 9 ---------
 app/javascript/src/javascripts/post_flags.js    | 9 ---------
 app/views/posts/partials/show/_options.html.erb | 6 ++----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/app/javascript/src/javascripts/post_appeals.js b/app/javascript/src/javascripts/post_appeals.js
index 31dbd0c54..0e5134ab6 100644
--- a/app/javascript/src/javascripts/post_appeals.js
+++ b/app/javascript/src/javascripts/post_appeals.js
@@ -1,17 +1,8 @@
-import Utility from './utility'
-
 let PostAppeal = {};
 
 PostAppeal.initialize_all = function() {
   if ($("#c-posts").length && $("#a-show").length) {
     this.initialize_appeal();
-    this.hide_or_show_appeal_link();
-  }
-}
-
-PostAppeal.hide_or_show_appeal_link = function() {
-  if ((Utility.meta("post-is-flagged") === "false") && (Utility.meta("post-is-deleted") === "false")) {
-    $("#appeal").hide();
   }
 }
 
diff --git a/app/javascript/src/javascripts/post_flags.js b/app/javascript/src/javascripts/post_flags.js
index f85aa806e..3dbd8e361 100644
--- a/app/javascript/src/javascripts/post_flags.js
+++ b/app/javascript/src/javascripts/post_flags.js
@@ -1,17 +1,8 @@
-import Utility from './utility'
-
 let PostFlag = {};
 
 PostFlag.initialize_all = function() {
   if ($("#c-posts").length && $("#a-show").length) {
     this.initialize_flag();
-    this.hide_or_show_flag_link();
-  }
-}
-
-PostFlag.hide_or_show_flag_link = function() {
-  if (Utility.meta("post-is-deleted") === "true") {
-    $("#flag").hide();
   }
 }
 
diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index 70696f05f..1a646b189 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -21,11 +21,9 @@
     <% if post.is_status_locked? %>
       <li><span id="status-locked-notice">Status locked</span></li>
     <% else %>
-      <% if !post.is_deleted? && !post.is_pending? %>
+      <% if !post.is_deleted? && !post.is_pending? && !post.is_flagged? %>
         <li><%= link_to "Flag", new_post_flag_path(:post_id => post.id), :id => "flag" %></li>
-      <% end %>
-
-      <% if post.is_flagged? || post.is_deleted? %>
+      <% elsif post.is_flagged? || post.is_deleted? %>
         <li><%= link_to "Appeal", new_post_appeal_path(:post_id => post.id), :id => "appeal" %></li>
       <% end %>