From bd7beed8a18eb0aa079cf15c3960b5cdf36acac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Fri, 20 Mar 2020 19:27:11 +0100
Subject: [PATCH] Remove no longer necessary flag/unflag HTML IDs

They were added in commit 015fe704 because we used them in the specs,
but we don't use them anymore and they make the code hard to read.
---
 app/views/budgets/investments/_flag_actions.html.erb | 10 ++++------
 app/views/comments/_flag_actions.html.erb            | 12 ++++--------
 app/views/debates/_flag_actions.html.erb             |  8 ++++----
 .../legislation/proposals/_flag_actions.html.erb     |  8 ++++----
 app/views/proposals/_flag_actions.html.erb           |  8 ++++----
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/app/views/budgets/investments/_flag_actions.html.erb b/app/views/budgets/investments/_flag_actions.html.erb
index d00bbe6b9..44f384c3b 100644
--- a/app/views/budgets/investments/_flag_actions.html.erb
+++ b/app/views/budgets/investments/_flag_actions.html.erb
@@ -1,25 +1,23 @@
 <span class="flag-content">
   <% if show_flag_action? investment %>
-    <a id="flag-expand-investment-<%= investment.id %>" data-toggle="flag-drop-investment-<%= investment.id %>" title="<%= t("shared.flag") %>">
+    <a data-toggle="flag-drop-investment-<%= investment.id %>" title="<%= t("shared.flag") %>">
       <span class="icon-flag flag-disable"></span>
     </a>
     <span class="dropdown-pane" id="flag-drop-investment-<%= investment.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t("shared.flag"), flag_budget_investment_path(investment.budget, investment.id),
                                     method: :put,
-                                    remote: true,
-                                    id: "flag-investment-#{investment.id}" %>
+                                    remote: true %>
     </span>
   <% end %>
 
   <% if show_unflag_action? investment %>
-    <a id="unflag-expand-investment-<%= investment.id %>" data-toggle="unflag-drop-investment-<%= investment.id %>" title="<%= t("shared.unflag") %>">
+    <a data-toggle="unflag-drop-investment-<%= investment.id %>" title="<%= t("shared.unflag") %>">
       <span class="icon-flag flag-active"></span>
     </a>
     <span class="dropdown-pane" id="unflag-drop-investment-<%= investment.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t("shared.unflag"), unflag_budget_investment_path(investment.budget, investment.id),
                                       method: :put,
-                                      remote: true,
-                                      id: "unflag-investment-#{investment.id}" %>
+                                      remote: true %>
     </span>
   <% end %>
 </span>
diff --git a/app/views/comments/_flag_actions.html.erb b/app/views/comments/_flag_actions.html.erb
index cac924994..16e50f93b 100644
--- a/app/views/comments/_flag_actions.html.erb
+++ b/app/views/comments/_flag_actions.html.erb
@@ -1,9 +1,7 @@
 <span class="flag-content">
   <% if show_flag_action? comment %>
     <span class="divider">&nbsp;|&nbsp;</span>
-    <a id="flag-expand-comment-<%= comment.id %>"
-    data-toggle="flag-drop-comment-<%= comment.id %>"
-    title="<%= t("shared.flag") %>">
+    <a data-toggle="flag-drop-comment-<%= comment.id %>" title="<%= t("shared.flag") %>">
       <span class="icon-flag flag-disable"></span>
     </a>
     <span id="flag-drop-comment-<%= comment.id %>"
@@ -11,20 +9,18 @@
          data-dropdown
          data-auto-focus="true">
       <%= link_to t("shared.flag"), flag_comment_path(comment), method: :put,
-                  remote: true, id: "flag-comment-#{comment.id}" %>
+                  remote: true %>
     </span>
   <% end %>
 
   <% if show_unflag_action? comment %>
     <span class="divider">&nbsp;|&nbsp;</span>
-    <a id="unflag-expand-comment-<%= comment.id %>"
-       data-toggle="unflag-drop-comment-<%= comment.id %>"
-       title="<%= t("shared.unflag") %>">
+    <a data-toggle="unflag-drop-comment-<%= comment.id %>" title="<%= t("shared.unflag") %>">
       <span class="icon-flag flag-active"></span>
     </a>
     <span class="dropdown-pane" id="unflag-drop-comment-<%= comment.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t("shared.unflag"), unflag_comment_path(comment), method: :put,
-                  remote: true, id: "unflag-comment-#{comment.id}" %>
+                  remote: true %>
     </span>
   <% end %>
 </span>
diff --git a/app/views/debates/_flag_actions.html.erb b/app/views/debates/_flag_actions.html.erb
index 66d4e9179..e6b3308df 100644
--- a/app/views/debates/_flag_actions.html.erb
+++ b/app/views/debates/_flag_actions.html.erb
@@ -1,19 +1,19 @@
 <span class="flag-content">
   <% if show_flag_action? debate %>
-    <a id="flag-expand-debate-<%= debate.id %>" data-toggle="flag-drop-debate-<%= debate.id %>" title="<%= t("shared.flag") %>">
+    <a data-toggle="flag-drop-debate-<%= debate.id %>" title="<%= t("shared.flag") %>">
       <span class="icon-flag flag-disable"></span>
     </a>
     <span class="dropdown-pane" id="flag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
-      <%= link_to t("shared.flag"), flag_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{debate.id}" %>
+      <%= link_to t("shared.flag"), flag_debate_path(debate), method: :put, remote: true %>
     </span>
   <% end %>
 
   <% if show_unflag_action? debate %>
-    <a id="unflag-expand-debate-<%= debate.id %>" data-toggle="unflag-drop-debate-<%= debate.id %>" title="<%= t("shared.unflag") %>">
+    <a data-toggle="unflag-drop-debate-<%= debate.id %>" title="<%= t("shared.unflag") %>">
       <span class="icon-flag flag-active"></span>
     </a>
     <span class="dropdown-pane" id="unflag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
-      <%= link_to t("shared.unflag"), unflag_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{debate.id}" %>
+      <%= link_to t("shared.unflag"), unflag_debate_path(debate), method: :put, remote: true %>
     </span>
   <% end %>
 </span>
diff --git a/app/views/legislation/proposals/_flag_actions.html.erb b/app/views/legislation/proposals/_flag_actions.html.erb
index 6d86b63a2..10a7892cc 100644
--- a/app/views/legislation/proposals/_flag_actions.html.erb
+++ b/app/views/legislation/proposals/_flag_actions.html.erb
@@ -1,19 +1,19 @@
 <span class="flag-content">
   <% if show_flag_action? proposal %>
-    <a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t("shared.flag") %>">
+    <a data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t("shared.flag") %>">
       <span class="icon-flag flag-disable"></span>
     </a>
     <span class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
-      <%= link_to t("shared.flag"), flag_legislation_process_proposal_path(proposal.process, proposal), method: :put, remote: true, id: "flag-proposal-#{proposal.id}" %>
+      <%= link_to t("shared.flag"), flag_legislation_process_proposal_path(proposal.process, proposal), method: :put, remote: true %>
     </span>
   <% end %>
 
   <% if show_unflag_action? proposal %>
-    <a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t("shared.unflag") %>">
+    <a data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t("shared.unflag") %>">
       <span class="icon-flag flag-active"></span>
     </a>
     <span class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
-      <%= link_to t("shared.unflag"), unflag_legislation_process_proposal_path(proposal.process, proposal), method: :put, remote: true, id: "unflag-proposal-#{proposal.id}" %>
+      <%= link_to t("shared.unflag"), unflag_legislation_process_proposal_path(proposal.process, proposal), method: :put, remote: true %>
     </span>
   <% end %>
 </span>
diff --git a/app/views/proposals/_flag_actions.html.erb b/app/views/proposals/_flag_actions.html.erb
index ec012e3df..ed8e7aab0 100644
--- a/app/views/proposals/_flag_actions.html.erb
+++ b/app/views/proposals/_flag_actions.html.erb
@@ -1,19 +1,19 @@
 <span class="flag-content">
   <% if show_flag_action? proposal %>
-    <a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t("shared.flag") %>">
+    <a data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t("shared.flag") %>">
       <span class="icon-flag flag-disable"></span>
     </a>
     <span class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
-      <%= link_to t("shared.flag"), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{proposal.id}" %>
+      <%= link_to t("shared.flag"), flag_proposal_path(proposal), method: :put, remote: true %>
     </span>
   <% end %>
 
   <% if show_unflag_action? proposal %>
-    <a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t("shared.unflag") %>">
+    <a data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t("shared.unflag") %>">
       <span class="icon-flag flag-active"></span>
     </a>
     <span class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
-      <%= link_to t("shared.unflag"), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{proposal.id}" %>
+      <%= link_to t("shared.unflag"), unflag_proposal_path(proposal), method: :put, remote: true %>
     </span>
   <% end %>
 </span>