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

master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
Conversation 0 Commits 203 Files Changed 134 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e8ea4972f3 - Show all commits

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

@ -19,11 +19,12 @@
<% valid_access_code = access_code_set && @room.access_code == session[:access_code] %> <% valid_access_code = access_code_set && @room.access_code == session[:access_code] %>
<% moderator_access_code_set = @room.moderator_access_code.present? && moderator_code_allowed? %> <% moderator_access_code_set = @room.moderator_access_code.present? && moderator_code_allowed? %>
<% valid_moderator_access_code = valid_moderator_access_code(session[:moderator_access_code]) %> <% valid_moderator_access_code = valid_moderator_access_code(session[:moderator_access_code]) %>
<% authorized = valid_access_code || valid_moderator_access_code || !access_code_set %>
<%= render 'rooms/components/room_event', render_recordings: valid_access_code || valid_moderator_access_code do %> <%= render 'rooms/components/room_event', render_recordings: authorized do %>
<% if room_authentication_required %> <% if room_authentication_required %>
<h2><%= t("administrator.site_settings.authentication.user-info") %></h2> <h2><%= t("administrator.site_settings.authentication.user-info") %></h2>
<% elsif valid_moderator_access_code || valid_access_code || !access_code_set %> <% elsif authorized %>
<%= form_for room_path(@room), method: :post do |f| %> <%= form_for room_path(@room), method: :post do |f| %>
<div class="input-group"> <div class="input-group">
<%= f.hidden_field(:search, :value => params[:search])%> <%= f.hidden_field(:search, :value => params[:search])%>