From bb83bf553dfd1fdb7133f335ef81cc30b9c454ca Mon Sep 17 00:00:00 2001
From: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Date: Thu, 30 Jul 2020 15:18:28 -0400
Subject: [PATCH] Revert hiding recording menus when recording disabled (#1959)

---
 app/views/rooms/components/_room_event.html.erb | 3 +--
 app/views/rooms/show.html.erb                   | 5 +----
 app/views/shared/_header.html.erb               | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/views/rooms/components/_room_event.html.erb b/app/views/rooms/components/_room_event.html.erb
index 1bc01cab..c301b679 100644
--- a/app/views/rooms/components/_room_event.html.erb
+++ b/app/views/rooms/components/_room_event.html.erb
@@ -40,7 +40,6 @@
   </div>
 </div>
 
-<% recording = room_configuration("Room Configuration Recording") %>
-<% if render_recordings && recording != "disabled" %>
+<% if render_recordings %>
   <%= render "shared/sessions", recordings: @public_recordings, pagy: @pagy, only_public: true, user_recordings: false, title: t("room.recordings") %>
 <% end %>
diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb
index 3e19ba4e..37760bbf 100644
--- a/app/views/rooms/show.html.erb
+++ b/app/views/rooms/show.html.erb
@@ -103,10 +103,7 @@
   </div>
 </div>
 
-<% recording = room_configuration("Room Configuration Recording") %>
-<% if recording != "disabled" %>
-  <%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%>
-<% end %>
+<%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%>
 
 <%= render "shared/modals/delete_room_modal" %>
 
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index 33961a66..5fc1ed08 100755
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -31,9 +31,7 @@
             <i class="fas fa-home pr-1 "></i><span class="d-none d-sm-inline-block"><%= t("header.dropdown.home") %></span>
           <% end %>
 
-          <% recording = room_configuration("Room Configuration Recording") %>
-          <% if current_user.role.get_permission("can_create_rooms") && !current_user.has_role?(:super_admin) &&
-            recording != "disabled" %>
+          <% if current_user.role.get_permission("can_create_rooms") && !current_user.has_role?(:super_admin) %>
             <% all_rec_page = params[:controller] == "users" && params[:action] == "recordings" ? "active" : "" %>
             <%= link_to get_user_recordings_path(current_user), class: "px-3 mx-1 mt-1 header-nav #{all_rec_page}" do %>
               <i class="fas fa-video pr-1"></i><span class="d-none d-sm-inline-block"><%= t("header.all_recordings") %></span>