From 99256adf1368fc5711b633e403773e6e6aefb5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Wed, 12 Jun 2019 00:02:14 +0200
Subject: [PATCH] Simplify manager/moderator/admin/official tables

Originally, the code was shared between the index action and the search
action, but since commit fb6dbdf2 that's no longer the case. So in the
index action we don't need to check whether a user is a
moderator/manager/admin/official or not; they all are.
---
 app/views/admin/administrators/index.html.erb | 22 ++++++-------------
 app/views/admin/managers/index.html.erb       | 18 ++++-----------
 app/views/admin/moderators/index.html.erb     | 17 ++++----------
 app/views/admin/officials/index.html.erb      |  2 +-
 4 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/app/views/admin/administrators/index.html.erb b/app/views/admin/administrators/index.html.erb
index 304760c7e03..db08c59332a 100644
--- a/app/views/admin/administrators/index.html.erb
+++ b/app/views/admin/administrators/index.html.erb
@@ -29,21 +29,13 @@
             <%= administrator.description %>
           </td>
           <td>
-            <% if administrator.persisted? %>
-              <%= link_to t("admin.actions.edit"),
-                          edit_admin_administrator_path(administrator),
-                          class: "button hollow" %>
-              <%= link_to t("admin.administrators.administrator.delete"),
-                          admin_administrator_path(administrator),
-                          method: :delete,
-                          class: "button hollow alert" %>
-            <% else %>
-              <%= link_to t("admin.administrators.administrator.add"),
-                          { controller: "admin/administrators", action: :create,
-                            user_id: administrator.user_id },
-                            method: :post,
-                            class: "button success expanded" %>
-            <% end %>
+            <%= link_to t("admin.actions.edit"),
+                        edit_admin_administrator_path(administrator),
+                        class: "button hollow" %>
+            <%= link_to t("admin.administrators.administrator.delete"),
+                        admin_administrator_path(administrator),
+                        method: :delete,
+                        class: "button hollow alert" %>
           </td>
         </tr>
       <% end %>
diff --git a/app/views/admin/managers/index.html.erb b/app/views/admin/managers/index.html.erb
index b9121ac8a33..0ff1971c42c 100644
--- a/app/views/admin/managers/index.html.erb
+++ b/app/views/admin/managers/index.html.erb
@@ -22,20 +22,10 @@
               <%= manager.email %>
             </td>
             <td>
-              <% if manager.persisted? %>
-                <%= link_to t("admin.managers.manager.delete"),
-                  admin_manager_path(manager),
-                  method: :delete,
-                  class: "button hollow alert expanded"
-                %>
-              <% else %>
-                <%= link_to t("admin.managers.manager.add"),
-                             { controller: "admin/managers",
-                               action: :create,
-                               user_id: manager.user_id },
-                               method: :post,
-                               class: "button success expanded" %>
-              <% end %>
+              <%= link_to t("admin.managers.manager.delete"),
+                admin_manager_path(manager),
+                method: :delete,
+                class: "button hollow alert expanded" %>
             </td>
           </tr>
         <% end %>
diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb
index be8eff1ad2d..770fd77c5ed 100644
--- a/app/views/admin/moderators/index.html.erb
+++ b/app/views/admin/moderators/index.html.erb
@@ -24,19 +24,10 @@
               <%= moderator.email %>
             </td>
             <td>
-              <% if moderator.persisted? %>
-                <%= link_to t("admin.moderators.moderator.delete"),
-                            admin_moderator_path(moderator),
-                            method: :delete,
-                            class: "button hollow alert expanded"
-                %>
-              <% else %>
-                <%= link_to t("admin.moderators.moderator.add"),
-                            { controller: "admin/moderators", action: :create,
-                              user_id: moderator.user_id },
-                              method: :post,
-                              class: "button success expanded" %>
-              <% end %>
+              <%= link_to t("admin.moderators.moderator.delete"),
+                          admin_moderator_path(moderator),
+                          method: :delete,
+                          class: "button hollow alert expanded" %>
             </td>
           </tr>
         <% end %>
diff --git a/app/views/admin/officials/index.html.erb b/app/views/admin/officials/index.html.erb
index 67921d3ab85..3b1e2b7dac3 100644
--- a/app/views/admin/officials/index.html.erb
+++ b/app/views/admin/officials/index.html.erb
@@ -28,7 +28,7 @@
             <%= t("admin.officials.level_#{official.official_level}") %>
           </td>
           <td>
-            <%= link_to official.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"),
+            <%= link_to t("admin.officials.search.edit_official"),
                         edit_admin_official_path(official), class: "button hollow expanded" %>
           </td>
         </tr>