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

GRN2-xx: Allowed file types now matches BigBlueButton (#1966)

Browse Source 
* Allowed file types now matches BigBlueButton

* Uppercased file types are now allowed

* Rubocop
This commit is contained in:
Ahmad Farhat
2020-08-04 10:35:07 -04:00
committed by GitHub
parent 35c82f9c17
commit 0710c569b7
7 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/rooms_controller.rb
View File

@ -418,7 +418,8 @@ class RoomsController < ApplicationController
# Checks if the file extension is allowed
def valid_file_type
Rails.configuration.allowed_file_types.split(",").include?(File.extname(room_params[:presentation].original_filename))
Rails.configuration.allowed_file_types.split(",")
.include?(File.extname(room_params[:presentation].original_filename.downcase))
end
# Gets the room setting based on the option set in the room configuration

2
app/views/shared/modals/_preupload_presentation_modal.html.erb
View File

@ -34,7 +34,7 @@
<p id="invalid-file-type" class="text-danger"><%= t("modal.preupload.invalid") %></p>
<div class="input-group mb-3">
<div class="custom-file text-left">
<%= f.label :presentation, t("modal.preupload.choose", type: allowed_file_types), id:"presentation-upload-label", class: "custom-file-label", "data-placeholder": t("modal.preupload.choose", type: allowed_file_types) %>
<%= f.label :presentation, t("modal.preupload.choose"), id:"presentation-upload-label", class: "custom-file-label", "data-placeholder": t("modal.preupload.choose", type: allowed_file_types) %>
<%= f.file_field :presentation, id: "presentation-upload", class: "custom-file-input cursor-pointer", accept: allowed_file_types, required: "true" %>
</div>
</div>