lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert hiding recording menus when recording disabled (#1959)

This commit is contained in:
Ahmad Farhat 2020-07-30 15:18:28 -04:00 committed by GitHub
parent ec93d5e472
commit bb83bf553d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/rooms/components/_room_event.html.erb
View File

@ -40,7 +40,6 @@
</div> </div>
</div> </div>
<% recording = room_configuration("Room Configuration Recording") %> <% if render_recordings %>
<% if render_recordings && recording != "disabled" %>
<%= render "shared/sessions", recordings: @public_recordings, pagy: @pagy, only_public: true, user_recordings: false, title: t("room.recordings") %> <%= render "shared/sessions", recordings: @public_recordings, pagy: @pagy, only_public: true, user_recordings: false, title: t("room.recordings") %>
<% end %> <% end %>

5
app/views/rooms/show.html.erb
View File

@ -103,10 +103,7 @@
</div> </div>
</div> </div>
<% recording = room_configuration("Room Configuration Recording") %> <%= render "shared/sessions", recordings: @recordings, pagy: @pagy, only_public: false, shared_room: @shared_room, user_recordings: false, title: t("room.recordings")%>
<% 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/modals/delete_room_modal" %> <%= render "shared/modals/delete_room_modal" %>

4
app/views/shared/_header.html.erb
View File

@ -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> <i class="fas fa-home pr-1 "></i><span class="d-none d-sm-inline-block"><%= t("header.dropdown.home") %></span>
<% end %> <% end %>
<% recording = room_configuration("Room Configuration Recording") %> <% 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) &&
recording != "disabled" %>
<% all_rec_page = params[:controller] == "users" && params[:action] == "recordings" ? "active" : "" %> <% 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 %> <%= 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> <i class="fas fa-video pr-1"></i><span class="d-none d-sm-inline-block"><%= t("header.all_recordings") %></span>