From aeb5edf8a062bddac6dee171f5414ac8fa5dc607 Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Tue, 4 Aug 2020 17:59:47 -0400 Subject: [PATCH] Hide recording table when disabled through room config (#1988) --- app/helpers/application_helper.rb | 6 ++++++ app/views/rooms/components/_room_event.html.erb | 2 +- app/views/rooms/show.html.erb | 4 +++- app/views/shared/_header.html.erb | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f6ffe003..dff6e29b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -124,4 +124,10 @@ module ApplicationHelper content_for(:page_title) { page_title } if content_for(:page_title).blank? page_title end + + # Indicates whether the recording tables should be hidden + def hide_recording_tables + return false unless recording_consent_required? + @settings.get_value("Room Configuration Recording") == "disabled" + end end diff --git a/app/views/rooms/components/_room_event.html.erb b/app/views/rooms/components/_room_event.html.erb index c301b679..a218e37a 100644 --- a/app/views/rooms/components/_room_event.html.erb +++ b/app/views/rooms/components/_room_event.html.erb @@ -40,6 +40,6 @@ -<% if render_recordings %> +<% if render_recordings && !hide_recording_tables %> <%= 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 37760bbf..4ac224ea 100644 --- a/app/views/rooms/show.html.erb +++ b/app/views/rooms/show.html.erb @@ -103,7 +103,9 @@ -<%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%> +<% unless hide_recording_tables %> + <%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%> +<% end %> <%= render "shared/modals/delete_room_modal" %> diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 5fc1ed08..22f0a957 100755 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -31,7 +31,7 @@ <%= t("header.dropdown.home") %> <% end %> - <% if current_user.role.get_permission("can_create_rooms") && !current_user.has_role?(:super_admin) %> + <% if current_user.role.get_permission("can_create_rooms") && !current_user.has_role?(:super_admin) && !hide_recording_tables %> <% 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 %> <%= t("header.all_recordings") %>